Split pref_service_unittest into generic vs. Chrome-specific parts.

chrome/browser/prefs/pref_service_unittest.cc

Index: chrome/browser/prefs/pref_service_unittest.cc
diff --git a/chrome/browser/prefs/pref_service_unittest.cc b/chrome/browser/prefs/pref_service_unittest.cc
index c71be93461f2ebdef860fc36252f3edbf16d37bd..a8bb05f9d6ad1505c1bfdcec1c814dedbdf8921b 100644
--- a/chrome/browser/prefs/pref_service_unittest.cc
+++ b/chrome/browser/prefs/pref_service_unittest.cc
@@ -4,44 +4,22 @@
 
 #include <string>
 
-#include "base/command_line.h"
-#include "base/file_util.h"
-#include "base/files/scoped_temp_dir.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/path_service.h"
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/mock_pref_change_callback.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_value_store.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/prefs/testing_pref_store.h"
-#include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/policy/configuration_policy_pref_store.h"
-#include "chrome/browser/policy/mock_configuration_policy_provider.h"
-#include "chrome/browser/prefs/browser_prefs.h"
-#include "chrome/browser/prefs/command_line_pref_store.h"
-#include "chrome/browser/prefs/pref_registry_syncable.h"
-#include "chrome/browser/prefs/pref_service_mock_builder.h"
-#include "chrome/browser/prefs/scoped_user_pref_update.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/pref_names.h"
-#include "chrome/test/base/chrome_render_view_host_test_harness.h"
-#include "chrome/test/base/testing_pref_service_syncable.h"
-#include "chrome/test/base/testing_profile.h"
-#include "content/public/test/test_browser_thread.h"
-#include "content/public/test/web_contents_tester.h"
+#include "chrome/test/base/testing_pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/test/data/resource.h"
-#include "webkit/glue/webpreferences.h"
 
-using content::BrowserThread;
-using content::WebContentsTester;
 using testing::_;
 using testing::Mock;
 
+const char kPrefName[] = "pref.name";
+
 TEST(PrefServiceTest, NoObserverFire) {
   TestingPrefServiceSimple prefs;
 
@@ -155,14 +133,11 @@ TEST(PrefServiceTest, Observers) {
 TEST(PrefServiceTest, GetValueChangedType) {
   const int kTestValue = 10;
   TestingPrefServiceSimple prefs;
-  prefs.registry()->RegisterIntegerPref(
-      prefs::kStabilityLaunchCount, kTestValue);
+  prefs.registry()->RegisterIntegerPref(kPrefName, kTestValue);
 
   // Check falling back to a recommended value.
-  prefs.SetUserPref(prefs::kStabilityLaunchCount,
-                    Value::CreateStringValue("not an integer"));
-  const PrefService::Preference* pref =
-      prefs.FindPreference(prefs::kStabilityLaunchCount);
+  prefs.SetUserPref(kPrefName, Value::CreateStringValue("not an integer"));
+  const PrefService::Preference* pref = prefs.FindPreference(kPrefName);
   ASSERT_TRUE(pref);
   const Value* value = pref->GetValue();
   ASSERT_TRUE(value);
@@ -172,48 +147,15 @@ TEST(PrefServiceTest, GetValueChangedType) {
   EXPECT_EQ(kTestValue, actual_int_value);
 }
 
-TEST(PrefServiceTest, UpdateCommandLinePrefStore) {
-  TestingPrefServiceSimple prefs;
-  prefs.registry()->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, false);
-
-  // Check to make sure the value is as expected.
-  const PrefService::Preference* pref =
-      prefs.FindPreference(prefs::kCloudPrintProxyEnabled);
-  ASSERT_TRUE(pref);
-  const Value* value = pref->GetValue();
-  ASSERT_TRUE(value);
-  EXPECT_EQ(Value::TYPE_BOOLEAN, value->GetType());
-  bool actual_bool_value = true;
-  EXPECT_TRUE(value->GetAsBoolean(&actual_bool_value));
-  EXPECT_FALSE(actual_bool_value);
-
-  // Change the command line.
-  CommandLine cmd_line(CommandLine::NO_PROGRAM);
-  cmd_line.AppendSwitch(switches::kEnableCloudPrintProxy);
-
-  // Call UpdateCommandLinePrefStore and check to see if the value has changed.
-  prefs.UpdateCommandLinePrefStore(new CommandLinePrefStore(&cmd_line));
-  pref = prefs.FindPreference(prefs::kCloudPrintProxyEnabled);
-  ASSERT_TRUE(pref);
-  value = pref->GetValue();
-  ASSERT_TRUE(value);
-  EXPECT_EQ(Value::TYPE_BOOLEAN, value->GetType());
-  actual_bool_value = false;
-  EXPECT_TRUE(value->GetAsBoolean(&actual_bool_value));
-  EXPECT_TRUE(actual_bool_value);
-}
-
 TEST(PrefServiceTest, GetValueAndGetRecommendedValue) {
   const int kDefaultValue = 5;
   const int kUserValue = 10;
   const int kRecommendedValue = 15;
   TestingPrefServiceSimple prefs;
-  prefs.registry()->RegisterIntegerPref(
-      prefs::kStabilityLaunchCount, kDefaultValue);
+  prefs.registry()->RegisterIntegerPref(kPrefName, kDefaultValue);
 
   // Create pref with a default value only.
-  const PrefService::Preference* pref =
-      prefs.FindPreference(prefs::kStabilityLaunchCount);
+  const PrefService::Preference* pref = prefs.FindPreference(kPrefName);
   ASSERT_TRUE(pref);
 
   // Check that GetValue() returns the default value.
@@ -229,8 +171,7 @@ TEST(PrefServiceTest, GetValueAndGetRecommendedValue) {
   ASSERT_FALSE(value);
 
   // Set a user-set value.
-  prefs.SetUserPref(prefs::kStabilityLaunchCount,
-                    Value::CreateIntegerValue(kUserValue));
+  prefs.SetUserPref(kPrefName, Value::CreateIntegerValue(kUserValue));
 
   // Check that GetValue() returns the user-set value.
   value = pref->GetValue();
@@ -245,7 +186,7 @@ TEST(PrefServiceTest, GetValueAndGetRecommendedValue) {
   ASSERT_FALSE(value);
 
   // Set a recommended value.
-  prefs.SetRecommendedPref(prefs::kStabilityLaunchCount,
+  prefs.SetRecommendedPref(kPrefName,
                            Value::CreateIntegerValue(kRecommendedValue));
 
   // Check that GetValue() returns the user-set value.
@@ -265,7 +206,7 @@ TEST(PrefServiceTest, GetValueAndGetRecommendedValue) {
   EXPECT_EQ(kRecommendedValue, actual_int_value);
 
   // Remove the user-set value.
-  prefs.RemoveUserPref(prefs::kStabilityLaunchCount);
+  prefs.RemoveUserPref(kPrefName);
 
   // Check that GetValue() returns the recommended value.
   value = pref->GetValue();
@@ -284,83 +225,6 @@ TEST(PrefServiceTest, GetValueAndGetRecommendedValue) {
   EXPECT_EQ(kRecommendedValue, actual_int_value);
 }
 
-class PrefServiceUserFilePrefsTest : public testing::Test {
- protected:
-  virtual void SetUp() {
-    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-
-    ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_dir_));
-    data_dir_ = data_dir_.AppendASCII("pref_service");
-    ASSERT_TRUE(file_util::PathExists(data_dir_));
-  }
-
-  void ClearListValue(PrefService* prefs, const char* key) {
-    ListPrefUpdate updater(prefs, key);
-    updater->Clear();
-  }
-
-  void ClearDictionaryValue(PrefService* prefs, const char* key) {
-    DictionaryPrefUpdate updater(prefs, key);
-    updater->Clear();
-  }
-
-  // The path to temporary directory used to contain the test operations.
-  base::ScopedTempDir temp_dir_;
-  // The path to the directory where the test data is stored.
-  base::FilePath data_dir_;
-  // A message loop that we can use as the file thread message loop.
-  MessageLoop message_loop_;
-};
-
-// Verifies that ListValue and DictionaryValue pref with non emtpy default
-// preserves its empty value.
-TEST_F(PrefServiceUserFilePrefsTest, PreserveEmptyValue) {
-  base::FilePath pref_file = temp_dir_.path().AppendASCII("write.json");
-
-  ASSERT_TRUE(file_util::CopyFile(
-      data_dir_.AppendASCII("read.need_empty_value.json"),
-      pref_file));
-
-  PrefServiceMockBuilder builder;
-  builder.WithUserFilePrefs(pref_file, message_loop_.message_loop_proxy());
-  scoped_refptr<PrefRegistrySyncable> registry(new PrefRegistrySyncable);
-  scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable(registry));
-
-  // Register testing prefs.
-  registry->RegisterListPref("list",
-                             PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterDictionaryPref("dict",
-                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
-
-  base::ListValue* non_empty_list = new base::ListValue;
-  non_empty_list->Append(base::Value::CreateStringValue("test"));
-  registry->RegisterListPref("list_needs_empty_value",
-                             non_empty_list,
-                             PrefRegistrySyncable::UNSYNCABLE_PREF);
-
-  base::DictionaryValue* non_empty_dict = new base::DictionaryValue;
-  non_empty_dict->SetString("dummy", "whatever");
-  registry->RegisterDictionaryPref("dict_needs_empty_value",
-                                   non_empty_dict,
-                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
-
-  // Set all testing prefs to empty.
-  ClearListValue(prefs.get(), "list");
-  ClearListValue(prefs.get(), "list_needs_empty_value");
-  ClearDictionaryValue(prefs.get(), "dict");
-  ClearDictionaryValue(prefs.get(), "dict_needs_empty_value");
-
-  // Write to file.
-  prefs->CommitPendingWrite();
-  message_loop_.RunUntilIdle();
-
-  // Compare to expected output.
-  base::FilePath golden_output_file =
-      data_dir_.AppendASCII("write.golden.need_empty_value.json");
-  ASSERT_TRUE(file_util::PathExists(golden_output_file));
-  EXPECT_TRUE(file_util::TextContentsEqual(golden_output_file, pref_file));
-}
-
 class PrefServiceSetValueTest : public testing::Test {
  protected:
   static const char kName[];
@@ -450,62 +314,3 @@ TEST_F(PrefServiceSetValueTest, SetListValue) {
   prefs_.Set(kName, empty);
   Mock::VerifyAndClearExpectations(&observer_);
 }
-
-class PrefServiceWebKitPrefs : public ChromeRenderViewHostTestHarness {
- protected:
-  PrefServiceWebKitPrefs() : ui_thread_(BrowserThread::UI, &message_loop_) {
-  }
-
-  virtual void SetUp() {
-    ChromeRenderViewHostTestHarness::SetUp();
-
-    // Supply our own profile so we use the correct profile data. The test
-    // harness is not supposed to overwrite a profile if it's already created.
-
-    // Set some (WebKit) user preferences.
-    TestingPrefServiceSyncable* pref_services =
-        profile()->GetTestingPrefService();
-#if defined(TOOLKIT_GTK)
-    pref_services->SetUserPref(prefs::kUsesSystemTheme,
-                               Value::CreateBooleanValue(false));
-#endif
-    pref_services->SetUserPref(prefs::kDefaultCharset,
-                               Value::CreateStringValue("utf8"));
-    pref_services->SetUserPref(prefs::kWebKitDefaultFontSize,
-                               Value::CreateIntegerValue(20));
-    pref_services->SetUserPref(prefs::kWebKitTextAreasAreResizable,
-                               Value::CreateBooleanValue(false));
-    pref_services->SetUserPref(prefs::kWebKitUsesUniversalDetector,
-                               Value::CreateBooleanValue(true));
-    pref_services->SetUserPref("webkit.webprefs.foo",
-                               Value::CreateStringValue("bar"));
-  }
-
- private:
-  content::TestBrowserThread ui_thread_;
-};
-
-// Tests to see that webkit preferences are properly loaded and copied over
-// to a WebPreferences object.
-TEST_F(PrefServiceWebKitPrefs, PrefsCopied) {
-  webkit_glue::WebPreferences webkit_prefs =
-      WebContentsTester::For(web_contents())->TestGetWebkitPrefs();
-
-  // These values have been overridden by the profile preferences.
-  EXPECT_EQ("UTF-8", webkit_prefs.default_encoding);
-  EXPECT_EQ(20, webkit_prefs.default_font_size);
-  EXPECT_FALSE(webkit_prefs.text_areas_are_resizable);
-  EXPECT_TRUE(webkit_prefs.uses_universal_detector);
-
-  // These should still be the default values.
-#if defined(OS_MACOSX)
-  const char kDefaultFont[] = "Times";
-#elif defined(OS_CHROMEOS)
-  const char kDefaultFont[] = "Tinos";
-#else
-  const char kDefaultFont[] = "Times New Roman";
-#endif
-  EXPECT_EQ(ASCIIToUTF16(kDefaultFont),
-            webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]);
-  EXPECT_TRUE(webkit_prefs.javascript_enabled);
-}