Fix content settings for hosted apps not displayed correctly after change from...

Fix content settings for hosted apps not displayed correctly after change from http://crrev.com/2525943002. I also changed GetChooserExceptionForPage() to have a displayName to be consistent with the other exception objects.

BUG=671547

Review-Url: https://codereview.chromium.org/2577043002
Cr-Commit-Position: refs/heads/master@{#439757}

chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc

@@ -70,6 +70,7 @@ class SiteSettingsHandlerTest : public testing::Test {
 
   void ValidateOrigin(
       const std::string& expected_origin,
+      const std::string& expected_display_name,
       const std::string& expected_embedding,
       const std::string& expected_setting,
       const std::string& expected_source,
@@ -91,9 +92,12 @@ class SiteSettingsHandlerTest : public testing::Test {
     EXPECT_EQ(1U, exceptions->GetSize());
     const base::DictionaryValue* exception;
     ASSERT_TRUE(exceptions->GetDictionary(0, &exception));
-    std::string origin, embedding_origin, setting, source;
+    std::string origin, embedding_origin, display_name, setting, source;
     ASSERT_TRUE(exception->GetString(site_settings::kOrigin, &origin));
     ASSERT_EQ(expected_origin, origin);
+    ASSERT_TRUE(
+        exception->GetString(site_settings::kDisplayName, &display_name));
+    ASSERT_EQ(expected_display_name, display_name);
     ASSERT_TRUE(exception->GetString(
         site_settings::kEmbeddingOrigin, &embedding_origin));
     ASSERT_EQ(expected_embedding, embedding_origin);
@@ -249,7 +253,7 @@ TEST_F(SiteSettingsHandlerTest, Origins) {
   listArgs.AppendString(kCallbackId);
   listArgs.AppendString("notifications");
   handler()->HandleGetExceptionList(&listArgs);
-  ValidateOrigin(google, google, "block", "preference", 2U);
+  ValidateOrigin(google, google, google, "block", "preference", 2U);
 
   // Reset things back to how they were.
   base::ListValue resetArgs;
@@ -273,9 +277,10 @@ TEST_F(SiteSettingsHandlerTest, ExceptionHelpers) {
                                          CONTENT_SETTING_BLOCK, "preference",
                                          false);
 
-  std::string primary_pattern, secondary_pattern, type;
+  std::string primary_pattern, secondary_pattern, display_name, type;
   bool incognito;
   CHECK(exception->GetString(site_settings::kOrigin, &primary_pattern));
+  CHECK(exception->GetString(site_settings::kDisplayName, &display_name));
   CHECK(exception->GetString(site_settings::kEmbeddingOrigin,
                              &secondary_pattern));
   CHECK(exception->GetString(site_settings::kSetting, &type));
@@ -309,6 +314,7 @@ TEST_F(SiteSettingsHandlerTest, ExceptionHelpers) {
   const base::DictionaryValue* dictionary;
   CHECK(exceptions->GetDictionary(0, &dictionary));
   CHECK(dictionary->GetString(site_settings::kOrigin, &primary_pattern));
+  CHECK(dictionary->GetString(site_settings::kDisplayName, &display_name));
   CHECK(dictionary->GetString(site_settings::kEmbeddingOrigin,
                               &secondary_pattern));
   CHECK(dictionary->GetString(site_settings::kSetting, &type));

chrome/browser/ui/webui/site_settings_helper.cc

@@ -118,6 +118,7 @@ void AddExceptionForHostedApp(const std::string& url_pattern,
 
   exception->SetString(site_settings::kSetting, setting_string);
   exception->SetString(site_settings::kOrigin, url_pattern);
+  exception->SetString(site_settings::kDisplayName, url_pattern);
   exception->SetString(site_settings::kEmbeddingOrigin, url_pattern);
   exception->SetString(site_settings::kSource, "HostedApp");
   exception->SetBoolean(site_settings::kIncognito, false);
@@ -355,6 +356,7 @@ std::unique_ptr<base::DictionaryValue> GetChooserExceptionForPage(
 
   exception->SetString(site_settings::kSetting, setting_string);
   exception->SetString(site_settings::kOrigin, requesting_origin.spec());
+  exception->SetString(site_settings::kDisplayName, requesting_origin.spec());
   exception->SetString(
       site_settings::kEmbeddingOrigin, embedding_origin.spec());
   exception->SetString(site_settings::kSource, provider_name);

chrome/browser/ui/webui/site_settings_helper_unittest.cc

@@ -30,6 +30,9 @@ class SiteSettingsHelperTest : public testing::Test {
     std::string actual_pattern;
     dict->GetString("origin", &actual_pattern);
     EXPECT_EQ(pattern, actual_pattern);
+    std::string actual_display_name;
+    dict->GetString("displayName", &actual_display_name);
+    EXPECT_EQ(pattern, actual_display_name);
     std::string actual_setting;
     dict->GetString("setting", &actual_setting);
     EXPECT_EQ(setting, actual_setting);