Fix content settings for hosted apps not displayed correctly.

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

 // Copyright 2016 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.
 
 #include "chrome/browser/ui/webui/settings/site_settings_handler.h"
 
 #include <memory>
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/webui/site_settings_helper.h"
@@ skipping 52 matching lines @@
     std::string setting;
     ASSERT_TRUE(default_value->GetString(kSetting, &setting));
     EXPECT_EQ(expected_setting, setting);
     std::string source;
     if (default_value->GetString(kSource, &source))
       EXPECT_EQ(expected_source, source);
   }
 
   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,
       size_t expected_total_calls) {
     EXPECT_EQ(expected_total_calls, web_ui()->call_data().size());
 
     const content::TestWebUI::CallData& data = *web_ui()->call_data().back();
     EXPECT_EQ("cr.webUIResponse", data.function_name());
 
     std::string callback_id;
     ASSERT_TRUE(data.arg1()->GetAsString(&callback_id));
     EXPECT_EQ(kCallbackId, callback_id);
     bool success = false;
     ASSERT_TRUE(data.arg2()->GetAsBoolean(&success));
     ASSERT_TRUE(success);
 
     const base::ListValue* exceptions;
     ASSERT_TRUE(data.arg3()->GetAsList(&exceptions));
     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);
     ASSERT_TRUE(exception->GetString(site_settings::kSetting, &setting));
     ASSERT_EQ(expected_setting, setting);
     ASSERT_TRUE(exception->GetString(site_settings::kSource, &source));
     ASSERT_EQ(expected_source, source);
   }
 
   void ValidateNoOrigin(size_t expected_total_calls) {
@@ skipping 135 matching lines @@
   setArgs.AppendString("block");
   setArgs.AppendBoolean(false);  // Incognito.
   handler()->HandleSetCategoryPermissionForOrigin(&setArgs);
   EXPECT_EQ(1U, web_ui()->call_data().size());
 
   // Verify the change was successful.
   base::ListValue listArgs;
   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;
   resetArgs.AppendString(google);
   resetArgs.AppendString(google);
   resetArgs.AppendString("notifications");
   resetArgs.AppendBoolean(false);  // Incognito.
   handler()->HandleResetCategoryPermissionForOrigin(&resetArgs);
   EXPECT_EQ(3U, web_ui()->call_data().size());
 
   // Verify the reset was successful.
   handler()->HandleGetExceptionList(&listArgs);
   ValidateNoOrigin(4U);
 }
 
 TEST_F(SiteSettingsHandlerTest, ExceptionHelpers) {
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString("[*.]google.com");
   std::unique_ptr<base::DictionaryValue> exception =
       site_settings::GetExceptionForPage(pattern, pattern, pattern.ToString(),
                                          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));
   CHECK(exception->GetBoolean(site_settings::kIncognito, &incognito));
 
   base::ListValue args;
   args.AppendString(primary_pattern);
   args.AppendString(secondary_pattern);
   args.AppendString("notifications");  // Chosen arbitrarily.
   args.AppendString(type);
@@ skipping 13 matching lines @@
                   .SetID("ahfgeienlihckogmohjhadlkjgocpleb")
                   .Build();
 
   std::unique_ptr<base::ListValue> exceptions(new base::ListValue);
   site_settings::AddExceptionForHostedApp(
       "[*.]google.com", *extension.get(), exceptions.get());
 
   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));
   CHECK(dictionary->GetBoolean(site_settings::kIncognito, &incognito));
 
   // Again, don't need to check the results.
   handler()->HandleSetCategoryPermissionForOrigin(&args);
 }
 
 TEST_F(SiteSettingsHandlerTest, Patterns) {
@@ skipping 40 matching lines @@
   args.AppendString("http://www.google.com");
   handler()->HandleRemoveZoomLevel(&args);
   ValidateZoom("", "", 3U);
 
   double default_level = host_zoom_map->GetDefaultZoomLevel();
   double level = host_zoom_map->GetZoomLevelForHostAndScheme("http", host);
   EXPECT_EQ(default_level, level);
 }
 
 }  // namespace settings