Don't clear existing extension-defined preferences and content settings when reloading or updating…

chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

 // Copyright (c) 2012 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 "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/webplugininfo.h"
 
 namespace extensions {
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {
-  EXPECT_TRUE(RunExtensionTest("content_settings/standard")) << message_;
+class ExtensionContentSettingsApiTest : public ExtensionApiTest {
+ public:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    ExtensionApiTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(switches::kDisablePluginsDiscovery);
+  }
 
-  HostContentSettingsMap* map =
-      browser()->profile()->GetHostContentSettingsMap();
-  CookieSettings* cookie_settings =
-      CookieSettings::Factory::GetForProfile(browser()->profile()).get();
+ protected:
+  void CheckContentSettings() {
+    HostContentSettingsMap* map =
+        browser()->profile()->GetHostContentSettingsMap();
+    CookieSettings* cookie_settings =
+        CookieSettings::Factory::GetForProfile(browser()->profile()).get();
 
-  // Check default content settings by using an unknown URL.
-  GURL example_url("http://www.example.com");
-  EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(
-      example_url, example_url));
-  EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed(
-      example_url, example_url));
-  EXPECT_TRUE(cookie_settings->IsCookieSessionOnly(example_url));
-  EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            map->GetContentSetting(example_url,
-                                   example_url,
-                                   CONTENT_SETTINGS_TYPE_IMAGES,
-                                   std::string()));
-  EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            map->GetContentSetting(example_url,
-                                   example_url,
-                                   CONTENT_SETTINGS_TYPE_JAVASCRIPT,
-                                   std::string()));
-  EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            map->GetContentSetting(example_url,
-                                   example_url,
-                                   CONTENT_SETTINGS_TYPE_PLUGINS,
-                                   std::string()));
-  EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            map->GetContentSetting(example_url,
-                                   example_url,
-                                   CONTENT_SETTINGS_TYPE_POPUPS,
-                                   std::string()));
-#if 0
-  // TODO(bauerb): Enable once geolocation settings are integrated into the
-  // HostContentSettingsMap.
-  EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            map->GetContentSetting(example_url,
-                                   example_url,
-                                   CONTENT_SETTINGS_TYPE_GEOLOCATION,
-                                   std::string()));
-#endif
-  EXPECT_EQ(CONTENT_SETTING_ASK,
-            map->GetContentSetting(example_url,
-                                   example_url,
-                                   CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
-                                   std::string()));
+    // Check default content settings by using an unknown URL.
+    GURL example_url("http://www.example.com");
+    EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(
+        example_url, example_url));
+    EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed(
+        example_url, example_url));
+    EXPECT_TRUE(cookie_settings->IsCookieSessionOnly(example_url));
+    EXPECT_EQ(CONTENT_SETTING_ALLOW,
+              map->GetContentSetting(example_url,
+                                     example_url,
+                                     CONTENT_SETTINGS_TYPE_IMAGES,
+                                     std::string()));
+    EXPECT_EQ(CONTENT_SETTING_BLOCK,
+              map->GetContentSetting(example_url,
+                                     example_url,
+                                     CONTENT_SETTINGS_TYPE_JAVASCRIPT,
+                                     std::string()));
+    EXPECT_EQ(CONTENT_SETTING_ALLOW,
+              map->GetContentSetting(example_url,
+                                     example_url,
+                                     CONTENT_SETTINGS_TYPE_PLUGINS,
+                                     std::string()));
+    EXPECT_EQ(CONTENT_SETTING_BLOCK,
+              map->GetContentSetting(example_url,
+                                     example_url,
+                                     CONTENT_SETTINGS_TYPE_POPUPS,
+                                     std::string()));
+  #if 0
+    // TODO(bauerb): Enable once geolocation settings are integrated into the
+    // HostContentSettingsMap.
+    EXPECT_EQ(CONTENT_SETTING_ALLOW,
+              map->GetContentSetting(example_url,
+                                     example_url,
+                                     CONTENT_SETTINGS_TYPE_GEOLOCATION,
+                                     std::string()));
+  #endif
+    EXPECT_EQ(CONTENT_SETTING_ASK,
+              map->GetContentSetting(example_url,
+                                     example_url,
+                                     CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+                                     std::string()));
 
-  // Check content settings for www.google.com
-  GURL url("http://www.google.com");
-  EXPECT_FALSE(cookie_settings->IsReadingCookieAllowed(url, url));
-  EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            map->GetContentSetting(
-                url, url, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
-  EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            map->GetContentSetting(
-                url, url, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string()));
-  EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            map->GetContentSetting(
-                url, url, CONTENT_SETTINGS_TYPE_PLUGINS, std::string()));
-  EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            map->GetContentSetting(
-                url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string()));
+    // Check content settings for www.google.com
+    GURL url("http://www.google.com");
+    EXPECT_FALSE(cookie_settings->IsReadingCookieAllowed(url, url));
+    EXPECT_EQ(CONTENT_SETTING_ALLOW,
+              map->GetContentSetting(
+                  url, url, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
+    EXPECT_EQ(CONTENT_SETTING_BLOCK,
+              map->GetContentSetting(
+                  url, url, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string()));
+    EXPECT_EQ(CONTENT_SETTING_BLOCK,
+              map->GetContentSetting(
+                  url, url, CONTENT_SETTINGS_TYPE_PLUGINS, std::string()));
+    EXPECT_EQ(CONTENT_SETTING_ALLOW,
+              map->GetContentSetting(
+                  url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string()));
 #if 0
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             map->GetContentSetting(
                 url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, ""));
 #endif
-  EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            map->GetContentSetting(
-                url, url, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));
-}
-
-class ContentSettingsGetResourceIdentifiersTest : public ExtensionApiTest {
- public:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    ExtensionApiTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kDisablePluginsDiscovery);
+    EXPECT_EQ(
+        CONTENT_SETTING_BLOCK,
+        map->GetContentSetting(
+            url, url, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));
   }
 };
 
+IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest, Standard) {
+  EXPECT_TRUE(RunExtensionTest("content_settings/standard")) << message_;
+
+  CheckContentSettings();
+
+  // The settings should not be reset when the extension is reloaded.

[Jeffrey Yasskin, 2013/09/06 21:31:56]

Could you also check that an uninstall+reinstall does reset the settings?

+  ReloadExtension(last_loaded_extension_id_);
+  CheckContentSettings();
+}
+
 // Flaky on the trybots. See http://crbug.com/96725.
-IN_PROC_BROWSER_TEST_F(ContentSettingsGetResourceIdentifiersTest,
-                       DISABLED_Test) {
+IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest,
+                       DISABLED_GetResourceIdentifiers) {
   base::FilePath::CharType kFooPath[] =
       FILE_PATH_LITERAL("/plugins/foo.plugin");
   base::FilePath::CharType kBarPath[] =
       FILE_PATH_LITERAL("/plugins/bar.plugin");
   const char* kFooName = "Foo Plugin";
   const char* kBarName = "Bar Plugin";
 
   content::PluginService::GetInstance()->RegisterInternalPlugin(
       content::WebPluginInfo(ASCIIToUTF16(kFooName),
                              base::FilePath(kFooPath),
                              ASCIIToUTF16("1.2.3"),
                              ASCIIToUTF16("foo")),
       false);
   content::PluginService::GetInstance()->RegisterInternalPlugin(
     content::WebPluginInfo(ASCIIToUTF16(kBarName),
                            base::FilePath(kBarPath),
                            ASCIIToUTF16("2.3.4"),
                            ASCIIToUTF16("bar")),
       false);
 
   EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))
       << message_;
 }
 
 }  // namespace extensions