Show human readable origin for Android apps

chrome/test/data/webui/settings/settings_passwords_section_browsertest.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /** @fileoverview Runs the Polymer Password Settings tests. */
 
 /** @const {string} Path to root from chrome/test/data/webui/settings/. */
 var ROOT_PATH = '../../../../../';
 
 // Polymer BrowserTest fixture.
@@ skipping 42 matching lines @@
    *     expected data.
    * @private
    */
   function validatePasswordList(listElement, passwordList) {
     assertEquals(passwordList.length, listElement.items.length);
     if (passwordList.length > 0) {
       // The first child is a template, skip and get the real 'first child'.
       var node = Polymer.dom(listElement).children[1];
       assert(node);
       var passwordInfo = passwordList[0];
-      assertEquals(passwordInfo.loginPair.originUrl,
+      assertEquals(

[hcarmona, 2017/04/21 22:45:46]

nit: keep on same line as assert for consistency w/ other lines here.

[jdoerrie, 2017/04/24 08:35:59]

Done.

+          passwordInfo.loginPair.urls.shown,
           node.querySelector('#originUrl').textContent.trim());
-      assertEquals(passwordInfo.linkUrl,
+      assertEquals(
+          passwordInfo.loginPair.urls.link,
           node.querySelector('#originUrl').href);
       assertEquals(passwordInfo.loginPair.username,
           node.querySelector('#username').textContent);
       assertEquals(passwordInfo.numCharactersInPassword,
           node.querySelector('#password').value.length);
     }
   }
 
   /**
    * Helper method that validates a that elements in the exception list match
    * the expected data.
    * @param {!Array<!Element>} nodes The nodes that will be checked.
-   * @param {!Array<!chrome.passwordsPrivate.ExceptionPair>} exceptionList The
+   * @param {!Array<!chrome.passwordsPrivate.ExceptionEntry>} exceptionList The
    *     expected data.
    * @private
    */
   function validateExceptionList(nodes, exceptionList) {
     assertEquals(exceptionList.length, nodes.length);
     for (var index = 0; index < exceptionList.length; ++index) {
       var node = nodes[index];
       var exception = exceptionList[index];
-      assertEquals(exception.exceptionUrl,
-                   node.querySelector('#exception').textContent);
-      assertEquals(exception.linkUrl,
-                   node.querySelector('#exception').href);
+      assertEquals(

[hcarmona, 2017/04/21 22:45:46]

nit: ditto

[jdoerrie, 2017/04/24 08:35:59]

Done.

+          exception.urls.shown, node.querySelector('#exception').textContent);
+      assertEquals(exception.urls.link, node.querySelector('#exception').href);
     }
   }
 
   /**
    * Returns all children of an element that has children added by a dom-repeat.
    * @param {!Element} element
    * @return {!Array<!Element>}
    * @private
    */
   function getDomRepeatChildren(element) {
     var nodes = element.querySelectorAll('.list-item:not([id])');
     return nodes;
   }
 
   /**
    * Allow the iron-list to be sized properly.
    * @param {!Object} passwordsSection
    * @private
    */
   function flushPasswordSection(passwordsSection) {
     passwordsSection.$.passwordList.notifyResize();
     Polymer.dom.flush();
   }
 
   /**
    * Helper method used to create a password section for the given lists.
    * @param {!PasswordManager} passwordManager
    * @param {!Array<!chrome.passwordsPrivate.PasswordUiEntry>} passwordList
-   * @param {!Array<!chrome.passwordsPrivate.ExceptionPair>} exceptionList
+   * @param {!Array<!chrome.passwordsPrivate.ExceptionEntry>} exceptionList
    * @return {!Object}
    * @private
    */
   function createPasswordsSection(passwordManager, passwordList,
       exceptionList) {
     // Override the PasswordManager data for testing.
     passwordManager.data.passwords = passwordList;
     passwordManager.data.exceptions = exceptionList;
 
     // Create a passwords-section to use for testing.
@@ skipping 17 matching lines @@
     return passwordDialog;
   }
 
   /**
    * Helper method used to test for a url in a list of passwords.
    * @param {!Array<!chrome.passwordsPrivate.PasswordUiEntry>} passwordList
    * @param {string} url The URL that is being searched for.
    */
   function listContainsUrl(passwordList, url) {
     for (var i = 0; i < passwordList.length; ++i) {
-      if (passwordList[i].loginPair.originUrl == url)
+      if (passwordList[i].loginPair.urls.origin == url)
         return true;
     }
     return false;
   }
 
   /**
    * Helper method used to test for a url in a list of passwords.
-   * @param {!Array<!chrome.passwordsPrivate.ExceptionPair>} exceptionList
+   * @param {!Array<!chrome.passwordsPrivate.ExceptionEntry>} exceptionList
    * @param {string} url The URL that is being searched for.
    */
   function exceptionsListContainsUrl(exceptionList, url) {
     for (var i = 0; i < exceptionList.length; ++i) {
-      if (exceptionList[i].exceptionUrl == url)
+      if (exceptionList[i].urls.orginUrl == url)
         return true;
     }
     return false;
   }
 
   suite('PasswordsSection', function() {
     /** @type {TestPasswordManager} */
     var passwordManager = null;
 
     setup(function() {
@@ skipping 86 matching lines @@
       var passwordsSection = createPasswordsSection(
           passwordManager, passwordList, []);
 
       // The first child is a template, skip and get the real 'first child'.
       var firstNode = Polymer.dom(passwordsSection.$.passwordList).children[1];
       assert(firstNode);
       var firstPassword = passwordList[0];
 
       passwordManager.onRemoveSavedPassword = function(detail) {
         // Verify that the event matches the expected value.
-        assertEquals(firstPassword.loginPair.originUrl, detail.originUrl);
+        assertEquals(firstPassword.loginPair.urls.origin, detail.urls.origin);
         assertEquals(firstPassword.loginPair.username, detail.username);
 
         // Clean up after self.
         passwordManager.onRemoveSavedPassword = null;
 
         done();
       };
 
       // Click the remove button on the first password.
       MockInteractions.tap(firstNode.querySelector('#passwordMenu'));
@@ skipping 173 matching lines @@
       assertEquals('text',
                    passwordDialog.$.passwordInput.type);
     });
 
     // Test will timeout if event is not received.
     test('onShowSavedPassword', function(done) {
       var item = FakeDataMaker.passwordEntry('goo.gl', 'bart', 1);
       var passwordDialog = createPasswordDialog(item);
 
       passwordDialog.addEventListener('show-password', function(event) {
-        assertEquals(item.loginPair.originUrl, event.detail.originUrl);
+        assertEquals(item.loginPair.urls.origin, event.detail.urls.origin);
         assertEquals(item.loginPair.username, event.detail.username);
         done();
       });
 
       MockInteractions.tap(passwordDialog.$.showPasswordButton);
     });
   });
 
   mocha.run();
 });