[Password manager] Human readable origins for Android credentials on chrome://settings/passwords

components/password_manager/core/browser/password_ui_utils_unittest.cc

Index: components/password_manager/core/browser/password_ui_utils_unittest.cc
diff --git a/components/password_manager/core/browser/password_ui_utils_unittest.cc b/components/password_manager/core/browser/password_ui_utils_unittest.cc
index c757000abc6c566a195e10e095deacdfdd8b1c98..73cffde757092e6785e53b34af460b05b550ce7a 100644
--- a/components/password_manager/core/browser/password_ui_utils_unittest.cc
+++ b/components/password_manager/core/browser/password_ui_utils_unittest.cc
@@ -31,28 +31,66 @@ TEST(GetShownOriginTest, RemovePrefixes) {
 
   for (const auto& test_case : kTestCases) {
     autofill::PasswordForm password_form;
-    password_form.signon_realm = "https://non.android.signon.com";
     password_form.origin = GURL(test_case.input);
-    bool is_android_uri;
-    EXPECT_EQ(test_case.output,
-              GetShownOrigin(password_form, "", &is_android_uri))
+    EXPECT_EQ(test_case.output, GetShownOrigin(password_form.origin, ""))
         << "for input " << test_case.input;
-    EXPECT_FALSE(is_android_uri) << "for input " << test_case.input;
-    EXPECT_EQ(test_case.output, GetShownOrigin(password_form.origin, ""));
   }
 }
 
-TEST(GetShownOriginTest, OriginFromAndroidForm) {
+TEST(GetShownOriginAndLinkUrlTest, OriginFromAndroidForm_NoAffiliatedRealm) {
   autofill::PasswordForm android_form;
   android_form.signon_realm =
       "android://"
       "m3HSJL1i83hdltRq0-o9czGb-8KJDKra4t_"
       "3JRlnPKcjI8PZm6XBHXx6zG4UuMXaDEZjR1wuXDre9G9zvN7AQw=="
       "@com.example.android";
+  android_form.affiliated_web_realm = "";

[engedy, 2016/03/02 14:22:10]

nit: Avoid using empty string literals.  Some STL implementations used to create
std::string's with buffers of size 1 to store the terminating zero.  I'm not
sure if that's still the case, but normally it is advised to use either " =
std::string()", or ".clear()".

[kolos1, 2016/03/07 10:47:00]

Done.

+
   bool is_android_uri;
-  EXPECT_EQ(GetShownOrigin(android_form, "", &is_android_uri),
+  GURL link_url;
+  bool origin_is_clickable;
+  EXPECT_EQ(GetShownOriginAndLinkUrl(android_form, "", &is_android_uri,

[engedy, 2016/03/02 14:22:10]

Swap order of arguments, first the expectation, then the actual value. Same
below, 3 places overall.

[kolos1, 2016/03/07 10:47:00]

Done.

+                                     &link_url, &origin_is_clickable),
             "android://com.example.android");
   EXPECT_TRUE(is_android_uri);
+  EXPECT_FALSE(origin_is_clickable);
+  EXPECT_EQ(GURL(android_form.signon_realm), link_url);
+}
+
+TEST(GetShownOriginAndLinkUrlTest, OriginFromAndroidForm_WithAffiliatedRealm) {
+  autofill::PasswordForm android_form;
+  android_form.signon_realm =
+      "android://"
+      "m3HSJL1i83hdltRq0-o9czGb-8KJDKra4t_"
+      "3JRlnPKcjI8PZm6XBHXx6zG4UuMXaDEZjR1wuXDre9G9zvN7AQw=="
+      "@com.example.android";
+  android_form.affiliated_web_realm = "https://example.com";
+
+  bool is_android_uri;
+  GURL link_url;
+  bool origin_is_clickable;
+  EXPECT_EQ(GetShownOriginAndLinkUrl(android_form, "", &is_android_uri,
+                                     &link_url, &origin_is_clickable),
+            "example.com");
+  EXPECT_TRUE(is_android_uri);
+  EXPECT_TRUE(origin_is_clickable);
+  EXPECT_EQ(GURL(android_form.affiliated_web_realm), link_url);
+}
+
+TEST(GetShownOriginAndLinkUrlTest, OriginFromNonAndroidForm) {
+  autofill::PasswordForm form;
+  form.signon_realm = "https://example.com";
+  form.origin = GURL("https://example.com/login?ref=1");
+
+  bool is_android_uri;
+  GURL link_url;
+  bool origin_is_clickable;
+  EXPECT_EQ(GetShownOriginAndLinkUrl(form, "", &is_android_uri, &link_url,
+                                     &origin_is_clickable),
+            "example.com");
+  EXPECT_FALSE(is_android_uri);
+  EXPECT_TRUE(origin_is_clickable);
+  EXPECT_EQ(form.origin, link_url);
 }
 
 }  // namespace password_manager