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

chrome/browser/extensions/api/preference/preference_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/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.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 "chrome/test/base/ui_test_utils.h"
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferenceApi) {
+class ExtensionPreferenceApiTest : public ExtensionApiTest {
+ protected:
+  void CheckPreferences() {
+    PrefService* pref_service = browser()->profile()->GetPrefs();
+    const PrefService::Preference* pref = pref_service->FindPreference(
+        prefs::kBlockThirdPartyCookies);
+    ASSERT_TRUE(pref);
+    EXPECT_TRUE(pref->IsExtensionControlled());
+    EXPECT_TRUE(pref_service->GetBoolean(prefs::kAlternateErrorPagesEnabled));
+    EXPECT_TRUE(pref_service->GetBoolean(autofill::prefs::kAutofillEnabled));
+    EXPECT_FALSE(pref_service->GetBoolean(prefs::kBlockThirdPartyCookies));
+    EXPECT_TRUE(pref_service->GetBoolean(prefs::kEnableHyperlinkAuditing));
+    EXPECT_TRUE(pref_service->GetBoolean(prefs::kEnableReferrers));
+    EXPECT_TRUE(pref_service->GetBoolean(prefs::kEnableTranslate));
+    EXPECT_TRUE(pref_service->GetBoolean(prefs::kNetworkPredictionEnabled));
+    EXPECT_TRUE(pref_service->GetBoolean(prefs::kSafeBrowsingEnabled));
+    EXPECT_TRUE(pref_service->GetBoolean(prefs::kSearchSuggestEnabled));
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, Standard) {
   PrefService* pref_service = browser()->profile()->GetPrefs();
   pref_service->SetBoolean(prefs::kAlternateErrorPagesEnabled, false);
   pref_service->SetBoolean(autofill::prefs::kAutofillEnabled, false);
   pref_service->SetBoolean(prefs::kBlockThirdPartyCookies, true);
   pref_service->SetBoolean(prefs::kEnableHyperlinkAuditing, false);
   pref_service->SetBoolean(prefs::kEnableReferrers, false);
   pref_service->SetBoolean(prefs::kEnableTranslate, false);
   pref_service->SetBoolean(prefs::kNetworkPredictionEnabled, false);
   pref_service->SetBoolean(prefs::kSafeBrowsingEnabled, false);
   pref_service->SetBoolean(prefs::kSearchSuggestEnabled, false);
 
   EXPECT_TRUE(RunExtensionTest("preference/standard")) << message_;
+  CheckPreferences();
 
-  const PrefService::Preference* pref = pref_service->FindPreference(
-      prefs::kBlockThirdPartyCookies);
-  ASSERT_TRUE(pref);
-  EXPECT_TRUE(pref->IsExtensionControlled());
-  EXPECT_TRUE(pref_service->GetBoolean(prefs::kAlternateErrorPagesEnabled));
-  EXPECT_TRUE(pref_service->GetBoolean(autofill::prefs::kAutofillEnabled));
-  EXPECT_FALSE(pref_service->GetBoolean(prefs::kBlockThirdPartyCookies));
-  EXPECT_TRUE(pref_service->GetBoolean(prefs::kEnableHyperlinkAuditing));
-  EXPECT_TRUE(pref_service->GetBoolean(prefs::kEnableReferrers));
-  EXPECT_TRUE(pref_service->GetBoolean(prefs::kEnableTranslate));
-  EXPECT_TRUE(pref_service->GetBoolean(prefs::kNetworkPredictionEnabled));
-  EXPECT_TRUE(pref_service->GetBoolean(prefs::kSafeBrowsingEnabled));
-  EXPECT_TRUE(pref_service->GetBoolean(prefs::kSearchSuggestEnabled));
+  // 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?

[Bernhard Bauer, 2013/09/10 13:28:18]

Done.

+  ReloadExtension(last_loaded_extension_id_);
+  CheckPreferences();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferencePersistentIncognito) {
+IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, PersistentIncognito) {
   PrefService* prefs = browser()->profile()->GetPrefs();
   prefs->SetBoolean(prefs::kBlockThirdPartyCookies, false);
 
   EXPECT_TRUE(
       RunExtensionTestIncognito("preference/persistent_incognito")) <<
       message_;
 
   // Setting an incognito preference should not create an incognito profile.
   EXPECT_FALSE(browser()->profile()->HasOffTheRecordProfile());
 
   PrefService* otr_prefs =
       browser()->profile()->GetOffTheRecordProfile()->GetPrefs();
   const PrefService::Preference* pref =
       otr_prefs->FindPreference(prefs::kBlockThirdPartyCookies);
   ASSERT_TRUE(pref);
   EXPECT_TRUE(pref->IsExtensionControlled());
   EXPECT_TRUE(otr_prefs->GetBoolean(prefs::kBlockThirdPartyCookies));
 
   pref = prefs->FindPreference(prefs::kBlockThirdPartyCookies);
   ASSERT_TRUE(pref);
   EXPECT_FALSE(pref->IsExtensionControlled());
   EXPECT_FALSE(prefs->GetBoolean(prefs::kBlockThirdPartyCookies));
 }
 
 // Flakily times out: http://crbug.com/106144
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_PreferenceIncognitoDisabled) {
+IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, DISABLED_IncognitoDisabled) {
   EXPECT_FALSE(RunExtensionTest("preference/persistent_incognito"));
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferenceSessionOnlyIncognito) {
+IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, SessionOnlyIncognito) {
   PrefService* prefs = browser()->profile()->GetPrefs();
   prefs->SetBoolean(prefs::kBlockThirdPartyCookies, false);
 
   EXPECT_TRUE(
       RunExtensionTestIncognito("preference/session_only_incognito")) <<
       message_;
 
   EXPECT_TRUE(browser()->profile()->HasOffTheRecordProfile());
 
   PrefService* otr_prefs =
       browser()->profile()->GetOffTheRecordProfile()->GetPrefs();
   const PrefService::Preference* pref =
       otr_prefs->FindPreference(prefs::kBlockThirdPartyCookies);
   ASSERT_TRUE(pref);
   EXPECT_TRUE(pref->IsExtensionControlled());
   EXPECT_FALSE(otr_prefs->GetBoolean(prefs::kBlockThirdPartyCookies));
 
   pref = prefs->FindPreference(prefs::kBlockThirdPartyCookies);
   ASSERT_TRUE(pref);
   EXPECT_FALSE(pref->IsExtensionControlled());
   EXPECT_FALSE(prefs->GetBoolean(prefs::kBlockThirdPartyCookies));
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferenceClear) {
+IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, Clear) {
   PrefService* pref_service = browser()->profile()->GetPrefs();
   pref_service->SetBoolean(prefs::kBlockThirdPartyCookies, true);
 
   EXPECT_TRUE(RunExtensionTest("preference/clear")) << message_;
 
   const PrefService::Preference* pref = pref_service->FindPreference(
       prefs::kBlockThirdPartyCookies);
   ASSERT_TRUE(pref);
   EXPECT_FALSE(pref->IsExtensionControlled());
   EXPECT_EQ(true, pref_service->GetBoolean(prefs::kBlockThirdPartyCookies));
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferenceOnChange) {
+IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, OnChange) {
   EXPECT_TRUE(RunExtensionTestIncognito("preference/onchange")) <<
       message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferenceOnChangeSplit) {
+IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, OnChangeSplit) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
   ResultCatcher catcher_incognito;
   catcher_incognito.RestrictToProfile(
       browser()->profile()->GetOffTheRecordProfile());
 
   // Open an incognito window.
   ui_test_utils::OpenURLOffTheRecord(browser()->profile(),
                                      GURL("chrome://newtab/"));
 
@@ skipping 100 matching lines @@
 
   // Test 6 - clearDefault
   EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready
   EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready
   listener10.Reply("ok");
   listener_incognito10.Reply("ok");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message();
 }