Show human readable origin for Android apps

chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc

Index: chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc
index 6ab38ffe1239b855a3749e30661def2a14b119f8..84148c7aa6dae525bae852e141a81afbd7fc3280 100644
--- a/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc
+++ b/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc
@@ -33,25 +33,20 @@ static const char kPlaintextPassword[] = "plaintext";
 
 api::passwords_private::PasswordUiEntry CreateEntry(size_t num) {
   api::passwords_private::PasswordUiEntry entry;
-  std::stringstream ss;
-  ss << "http://test" << num << ".com";
-  entry.login_pair.origin_url = ss.str();
-  ss << "/login";
-  entry.link_url = ss.str();
-  ss.clear();
-  ss << "testName" << num;
-  entry.login_pair.username = ss.str();
+  entry.login_pair.urls.shown_url = "test" + std::to_string(num) + ".com";
+  entry.login_pair.urls.origin_url =
+      "http://" + entry.login_pair.urls.shown_url + "/login";
+  entry.login_pair.urls.link_url = entry.login_pair.urls.origin_url;
+  entry.login_pair.username = "testName" + std::to_string(num);
   entry.num_characters_in_password = kNumCharactersInPassword;
   return entry;
 }
 
-api::passwords_private::ExceptionPair CreateException(size_t num) {
-  api::passwords_private::ExceptionPair exception;
-  std::stringstream ss;
-  ss << "http://exception" << num << ".com";
-  exception.exception_url = ss.str();
-  ss << "/login";
-  exception.link_url = ss.str();
+api::passwords_private::ExceptionEntry CreateException(size_t num) {
+  api::passwords_private::ExceptionEntry exception;
+  exception.urls.shown_url = "exception" + std::to_string(num) + ".com";
+  exception.urls.origin_url = "http://" + exception.urls.shown_url + "/login";
+  exception.urls.link_url = exception.urls.origin_url;
   return exception;
 }
 
@@ -89,7 +84,7 @@ class TestDelegate : public PasswordsPrivateDelegate {
   }
 
   void GetPasswordExceptionsList(
-      const ExceptionPairsCallback& callback) override {
+      const ExceptionEntriesCallback& callback) override {
     callback.Run(current_exceptions_);
   }
 
@@ -134,7 +129,7 @@ class TestDelegate : public PasswordsPrivateDelegate {
   // observers are added, this delegate can send the current lists without
   // having to request them from |password_manager_presenter_| again.
   std::vector<api::passwords_private::PasswordUiEntry> current_entries_;
-  std::vector<api::passwords_private::ExceptionPair> current_exceptions_;
+  std::vector<api::passwords_private::ExceptionEntry> current_exceptions_;
   Profile* profile_;
 };