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

chrome/browser/extensions/api/preference/preference_apitest.cc

Index: chrome/browser/extensions/api/preference/preference_apitest.cc
diff --git a/chrome/browser/extensions/api/preference/preference_apitest.cc b/chrome/browser/extensions/api/preference/preference_apitest.cc
index 98be5cd99b03290bb8422643ad72c4768cccec96..37cdab71cff4ed9fc18a587d4597b1e7eeb78ca3 100644
--- a/chrome/browser/extensions/api/preference/preference_apitest.cc
+++ b/chrome/browser/extensions/api/preference/preference_apitest.cc
@@ -4,6 +4,8 @@
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
@@ -11,38 +13,116 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/notification_service.h"
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferenceApi) {
-  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_;
-
-  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));
+namespace {
+
+void ReleaseBrowserProcessModule() {
+  g_browser_process->ReleaseModule();
+}
+
+}  // namespace
+
+class ExtensionPreferenceApiTest : public ExtensionApiTest {
+ protected:
+  ExtensionPreferenceApiTest() : profile_(NULL) {}
+
+  void CheckPreferencesSet() {
+    PrefService* prefs = profile_->GetPrefs();
+    const PrefService::Preference* pref = prefs->FindPreference(
+        prefs::kBlockThirdPartyCookies);
+    ASSERT_TRUE(pref);
+    EXPECT_TRUE(pref->IsExtensionControlled());
+    EXPECT_TRUE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled));
+    EXPECT_TRUE(prefs->GetBoolean(autofill::prefs::kAutofillEnabled));
+    EXPECT_FALSE(prefs->GetBoolean(prefs::kBlockThirdPartyCookies));
+    EXPECT_TRUE(prefs->GetBoolean(prefs::kEnableHyperlinkAuditing));
+    EXPECT_TRUE(prefs->GetBoolean(prefs::kEnableReferrers));
+    EXPECT_TRUE(prefs->GetBoolean(prefs::kEnableTranslate));
+    EXPECT_TRUE(prefs->GetBoolean(prefs::kNetworkPredictionEnabled));
+    EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
+    EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
+  }
+
+  void CheckPreferencesCleared() {
+    PrefService* prefs = profile_->GetPrefs();
+    const PrefService::Preference* pref = prefs->FindPreference(
+        prefs::kBlockThirdPartyCookies);
+    ASSERT_TRUE(pref);
+    EXPECT_FALSE(pref->IsExtensionControlled());
+    EXPECT_FALSE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled));
+    EXPECT_FALSE(prefs->GetBoolean(autofill::prefs::kAutofillEnabled));
+    EXPECT_TRUE(prefs->GetBoolean(prefs::kBlockThirdPartyCookies));
+    EXPECT_FALSE(prefs->GetBoolean(prefs::kEnableHyperlinkAuditing));
+    EXPECT_FALSE(prefs->GetBoolean(prefs::kEnableReferrers));
+    EXPECT_FALSE(prefs->GetBoolean(prefs::kEnableTranslate));
+    EXPECT_FALSE(prefs->GetBoolean(prefs::kNetworkPredictionEnabled));
+    EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
+    EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
+  }
+
+  virtual void SetUpOnMainThread() OVERRIDE {
+    ExtensionApiTest::SetUpOnMainThread();
+
+    // The browser might get closed later (and therefore be destroyed), so we
+    // save the profile.
+    profile_ = browser()->profile();
+
+    // Closing the last browser window also releases a module reference. Make
+    // sure it's not the last one, so the message loop doesn't quit
+    // unexpectedly.
+    g_browser_process->AddRefModule();
+  }
+
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    // ReleaseBrowserProcessModule() needs to be called in a message loop, so we
+    // post a task to do it, then run the message loop.
+    base::MessageLoop::current()->PostTask(
+        FROM_HERE, base::Bind(&ReleaseBrowserProcessModule));
+    content::RunAllPendingInMessageLoop();
+
+    ExtensionApiTest::CleanUpOnMainThread();
+  }
+
+  Profile* profile_;
+};
+
+IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, Standard) {
+  PrefService* prefs = profile_->GetPrefs();
+  prefs->SetBoolean(prefs::kAlternateErrorPagesEnabled, false);
+  prefs->SetBoolean(autofill::prefs::kAutofillEnabled, false);
+  prefs->SetBoolean(prefs::kBlockThirdPartyCookies, true);
+  prefs->SetBoolean(prefs::kEnableHyperlinkAuditing, false);
+  prefs->SetBoolean(prefs::kEnableReferrers, false);
+  prefs->SetBoolean(prefs::kEnableTranslate, false);
+  prefs->SetBoolean(prefs::kNetworkPredictionEnabled, false);
+  prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
+  prefs->SetBoolean(prefs::kSearchSuggestEnabled, false);
+
+  const char kExtensionPath[] = "preference/standard";
+
+  EXPECT_TRUE(RunExtensionSubtest(kExtensionPath, "test.html")) << message_;
+  CheckPreferencesSet();
+
+  // The settings should not be reset when the extension is reloaded.
+  ReloadExtension(last_loaded_extension_id_);
+  CheckPreferencesSet();
+
+  // Uninstalling and installing the extension (without running the test that
+  // calls the extension API) should clear the settings.
+  content::WindowedNotificationObserver observer(
+      chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
+      content::NotificationService::AllSources());
+  UninstallExtension(last_loaded_extension_id_);
+  observer.Wait();
+  CheckPreferencesCleared();
+
+  LoadExtension(test_data_dir_.AppendASCII(kExtensionPath));
+  CheckPreferencesCleared();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferencePersistentIncognito) {
-  PrefService* prefs = browser()->profile()->GetPrefs();
+IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, PersistentIncognito) {
+  PrefService* prefs = profile_->GetPrefs();
   prefs->SetBoolean(prefs::kBlockThirdPartyCookies, false);
 
   EXPECT_TRUE(
@@ -50,10 +130,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferencePersistentIncognito) {
       message_;
 
   // Setting an incognito preference should not create an incognito profile.
-  EXPECT_FALSE(browser()->profile()->HasOffTheRecordProfile());
+  EXPECT_FALSE(profile_->HasOffTheRecordProfile());
 
-  PrefService* otr_prefs =
-      browser()->profile()->GetOffTheRecordProfile()->GetPrefs();
+  PrefService* otr_prefs = profile_->GetOffTheRecordProfile()->GetPrefs();
   const PrefService::Preference* pref =
       otr_prefs->FindPreference(prefs::kBlockThirdPartyCookies);
   ASSERT_TRUE(pref);
@@ -67,22 +146,21 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferencePersistentIncognito) {
 }
 
 // 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) {
-  PrefService* prefs = browser()->profile()->GetPrefs();
+IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, SessionOnlyIncognito) {
+  PrefService* prefs = profile_->GetPrefs();
   prefs->SetBoolean(prefs::kBlockThirdPartyCookies, false);
 
   EXPECT_TRUE(
       RunExtensionTestIncognito("preference/session_only_incognito")) <<
       message_;
 
-  EXPECT_TRUE(browser()->profile()->HasOffTheRecordProfile());
+  EXPECT_TRUE(profile_->HasOffTheRecordProfile());
 
-  PrefService* otr_prefs =
-      browser()->profile()->GetOffTheRecordProfile()->GetPrefs();
+  PrefService* otr_prefs = profile_->GetOffTheRecordProfile()->GetPrefs();
   const PrefService::Preference* pref =
       otr_prefs->FindPreference(prefs::kBlockThirdPartyCookies);
   ASSERT_TRUE(pref);
@@ -95,34 +173,32 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferenceSessionOnlyIncognito) {
   EXPECT_FALSE(prefs->GetBoolean(prefs::kBlockThirdPartyCookies));
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferenceClear) {
-  PrefService* pref_service = browser()->profile()->GetPrefs();
-  pref_service->SetBoolean(prefs::kBlockThirdPartyCookies, true);
+IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, Clear) {
+  PrefService* prefs = profile_->GetPrefs();
+  prefs->SetBoolean(prefs::kBlockThirdPartyCookies, true);
 
   EXPECT_TRUE(RunExtensionTest("preference/clear")) << message_;
 
-  const PrefService::Preference* pref = pref_service->FindPreference(
+  const PrefService::Preference* pref = prefs->FindPreference(
       prefs::kBlockThirdPartyCookies);
   ASSERT_TRUE(pref);
   EXPECT_FALSE(pref->IsExtensionControlled());
-  EXPECT_EQ(true, pref_service->GetBoolean(prefs::kBlockThirdPartyCookies));
+  EXPECT_EQ(true, prefs->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());
+  catcher.RestrictToProfile(profile_);
   ResultCatcher catcher_incognito;
-  catcher_incognito.RestrictToProfile(
-      browser()->profile()->GetOffTheRecordProfile());
+  catcher_incognito.RestrictToProfile(profile_->GetOffTheRecordProfile());
 
   // Open an incognito window.
-  ui_test_utils::OpenURLOffTheRecord(browser()->profile(),
-                                     GURL("chrome://newtab/"));
+  ui_test_utils::OpenURLOffTheRecord(profile_, GURL("chrome://newtab/"));
 
   // changeDefault listeners.
   ExtensionTestMessageListener listener1("changeDefault regular ready", true);