Merge branch 'master' into default-pref

2 files changed, 4 insertions, 4 deletions

diff --git a/toolkit/components/passwordmgr/LoginHelper.jsm b/toolkit/components/passwordmgr/LoginHelper.jsm
index e0c4d872b..c6cd40915 100644
--- a/toolkit/components/passwordmgr/LoginHelper.jsm
+++ b/toolkit/components/passwordmgr/LoginHelper.jsm
@@ -202,7 +202,7 @@ this.LoginHelper = {
           return true;
         }
       } catch (ex) {
-        // newURI will throw for some values e.g. chrome://FirefoxAccounts
+        // newURI will throw for some values
         return false;
       }
     }
@@ -406,7 +406,7 @@ this.LoginHelper = {
       try {
         preferredOriginScheme = Services.io.newURI(preferredOrigin, null, null).scheme;
       } catch (ex) {
-        // Handle strings that aren't valid URIs e.g. chrome://FirefoxAccounts
+        // Handle strings that aren't valid URIs
       }
     }
 
@@ -457,7 +457,7 @@ this.LoginHelper = {
 
               return loginURI.scheme == preferredOriginScheme;
             } catch (ex) {
-              // Some URLs aren't valid nsIURI (e.g. chrome://FirefoxAccounts)
+              // Some URLs aren't valid nsIURI
               log.debug("dedupeLogins/shouldReplaceExisting: Error comparing schemes:",
                         existingLogin.hostname, login.hostname,
                         "preferredOrigin:", preferredOrigin, ex);
diff --git a/toolkit/components/passwordmgr/storage-mozStorage.js b/toolkit/components/passwordmgr/storage-mozStorage.js
index 7fc9e57fd..9da244f7a 100644
--- a/toolkit/components/passwordmgr/storage-mozStorage.js
+++ b/toolkit/components/passwordmgr/storage-mozStorage.js
@@ -471,7 +471,7 @@ LoginManagerStorage_mozStorage.prototype = {
                 params["http" + field] = "http://" + valueURI.hostPort;
               }
             } catch (ex) {
-              // newURI will throw for some values (e.g. chrome://FirefoxAccounts)
+              // newURI will throw for some values
               // but those URLs wouldn't support upgrades anyways.
             }
             break;