Add FilePath setter/getter to pref service....

chrome/common/pref_service_unittest.cc

 // Copyright (c) 2006-2008 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/file_util.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/test/data/resource.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 class PrefServiceTest : public testing::Test {
 protected:
   virtual void SetUp() {
     // Name a subdirectory of the temp directory.
     ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_dir_));
-    file_util::AppendToPath(&test_dir_, L"PrefServiceTest");
+    test_dir_ = test_dir_.AppendASCII("PrefServiceTest");
 
     // Create a fresh, empty copy of this directory.
     file_util::Delete(test_dir_, true);
     file_util::CreateDirectory(test_dir_);
 
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_dir_));
-    file_util::AppendToPath(&data_dir_, L"pref_service");
+    data_dir_ = data_dir_.AppendASCII("pref_service");
     ASSERT_TRUE(file_util::PathExists(data_dir_));
   }
   virtual void TearDown() {
     // Clean up test directory
-    ASSERT_TRUE(file_util::Delete(test_dir_, false));
+    ASSERT_TRUE(file_util::Delete(test_dir_, true));
     ASSERT_FALSE(file_util::PathExists(test_dir_));
   }
 
   // the path to temporary directory used to contain the test operations
-  std::wstring test_dir_;
+  FilePath test_dir_;
   // the path to the directory where the test data is stored
-  std::wstring data_dir_;
+  FilePath data_dir_;
 };
 
 class TestPrefObserver : public NotificationObserver {
  public:
   TestPrefObserver(const PrefService* prefs, const std::wstring& pref_name,
       const std::wstring& new_pref_value)
       : observer_fired_(false),
         prefs_(prefs),
         pref_name_(pref_name),
         new_pref_value_(new_pref_value) {
@@ skipping 25 matching lines @@
   const std::wstring pref_name_;
   std::wstring new_pref_value_;
 };
 
 }  // anonymous namespace
 
 TEST_F(PrefServiceTest, Basic) {
   PrefService prefs;
 
   // Test that it fails on nonexistent file.
-  std::wstring bogus_input_file = data_dir_;
-  file_util::AppendToPath(&bogus_input_file, L"read.txt");
+  FilePath bogus_input_file = data_dir_.AppendASCII("read.txt");
   EXPECT_FALSE(prefs.LoadPersistentPrefs(bogus_input_file));
 
   // Test that the persistent value can be loaded.
-  std::wstring input_file = data_dir_;
-  file_util::AppendToPath(&input_file, L"read.json");
+  FilePath input_file = data_dir_.AppendASCII("read.json");
   ASSERT_TRUE(file_util::PathExists(input_file));
   ASSERT_TRUE(prefs.LoadPersistentPrefs(input_file));
 
   // Register test prefs.
   const wchar_t kNewWindowsInTabs[] = L"tabs.new_windows_in_tabs";
   const wchar_t kMaxTabs[] = L"tabs.max_tabs";
   prefs.RegisterStringPref(prefs::kHomePage, L"");
   prefs.RegisterBooleanPref(kNewWindowsInTabs, false);
   prefs.RegisterIntegerPref(kMaxTabs, 0);
 
   std::wstring microsoft(L"http://www.microsoft.com");
   std::wstring cnn(L"http://www.cnn.com");
   std::wstring homepage(L"http://www.example.com");
 
   EXPECT_EQ(cnn, prefs.GetString(prefs::kHomePage));
 
+  const wchar_t kSomeDirectory[] = L"some_directory";
+  FilePath some_path(FILE_PATH_LITERAL("/usr/sbin/"));
+  prefs.RegisterFilePathPref(kSomeDirectory, FilePath());
+
   // Now test that the transient value overrides the persistent value,
   // without actually altering the persistent store.
   EXPECT_TRUE(prefs.transient()->SetString(prefs::kHomePage, microsoft));
   EXPECT_TRUE(prefs.transient()->GetString(prefs::kHomePage, &homepage));
   EXPECT_EQ(microsoft, homepage);
 
   EXPECT_EQ(microsoft, prefs.GetString(prefs::kHomePage));
 
   // Test reading some other data types from sub-dictionaries, and
   // writing to the persistent store.
   EXPECT_TRUE(prefs.GetBoolean(kNewWindowsInTabs));
   prefs.SetBoolean(kNewWindowsInTabs, false);
   EXPECT_FALSE(prefs.GetBoolean(kNewWindowsInTabs));
 
   EXPECT_EQ(20, prefs.GetInteger(kMaxTabs));
   prefs.SetInteger(kMaxTabs, 10);
   EXPECT_EQ(10, prefs.GetInteger(kMaxTabs));
 
+  EXPECT_EQ(FilePath::StringType(FILE_PATH_LITERAL("/usr/local/")),
+      prefs.GetFilePath(kSomeDirectory).value());
+  prefs.SetFilePath(kSomeDirectory, some_path);
+  EXPECT_EQ(some_path.value(), prefs.GetFilePath(kSomeDirectory).value());
+
   // Serialize and compare to expected output.
-  std::wstring output_file = test_dir_;
-  file_util::AppendToPath(&output_file, L"write.json");
+  FilePath output_file = test_dir_.AppendASCII("write.json");
   prefs.pref_filename_ = output_file;
   ASSERT_TRUE(prefs.SavePersistentPrefs(NULL));
-  std::wstring golden_output_file = data_dir_;
-  file_util::AppendToPath(&golden_output_file, L"write.golden.json");
+  FilePath golden_output_file = data_dir_.AppendASCII("write.golden.json");
   ASSERT_TRUE(file_util::PathExists(golden_output_file));
   ASSERT_TRUE(file_util::ContentsEqual(golden_output_file, output_file));
 }
 
 TEST_F(PrefServiceTest, Overlay) {
   const std::string transient =
     "{\"bool\":true, \"int\":2, \"real\":2.0, \"string\":\"transient\","
     "\"dictionary\":{\"value\":\"transient\"},"
     "\"list\":[\"transient\"]}";
 
   std::wstring persistent_string(L"persistent");
   std::wstring transient_string(L"transient");
 
   PrefService prefs;
 
-  std::wstring persistent_file = data_dir_;
-  file_util::AppendToPath(&persistent_file, L"overlay.json");
+  FilePath persistent_file = data_dir_.AppendASCII("overlay.json");
   EXPECT_TRUE(prefs.LoadPersistentPrefs(persistent_file));
 
   Value* transient_value;
   {
     JSONStringValueSerializer serializer(transient);
     transient_value = serializer.Deserialize(NULL);
     ASSERT_TRUE(transient_value);
   }
   prefs.transient()->Set(transient_string, transient_value);
 
@@ skipping 105 matching lines @@
     ASSERT_TRUE(member_value);
     std::wstring result_string;
     ASSERT_TRUE(member_value->GetAsString(&result_string));
     ASSERT_EQ(transient_string, result_string);
   }
 }
 
 TEST_F(PrefServiceTest, Observers) {
   PrefService prefs;
 
-  std::wstring input_file = data_dir_;
-  file_util::AppendToPath(&input_file, L"read.json");
+  FilePath input_file = data_dir_.AppendASCII("read.json");
   EXPECT_TRUE(file_util::PathExists(input_file));
   EXPECT_TRUE(prefs.LoadPersistentPrefs(input_file));
 
   const wchar_t pref_name[] = L"homepage";
   prefs.RegisterStringPref(pref_name, L"");
   EXPECT_EQ(std::wstring(L"http://www.cnn.com"), prefs.GetString(pref_name));
 
   const std::wstring new_pref_value(L"http://www.google.com/");
   TestPrefObserver obs(&prefs, pref_name, new_pref_value);
   prefs.AddPrefObserver(pref_name, &obs);
@@ skipping 19 matching lines @@
   obs2.Reset(new_pref_value);
   // This should only fire the observer in obs2.
   prefs.SetString(pref_name, new_pref_value);
   EXPECT_FALSE(obs.observer_fired());
   EXPECT_TRUE(obs2.observer_fired());
 
   // Ok, clean up.
   prefs.RemovePrefObserver(pref_name, &obs2);
 }
 
+// TODO(port): port this test to POSIX.
+#if defined(OS_WIN)
 TEST_F(PrefServiceTest, LocalizedPrefs) {
   PrefService prefs;
   const wchar_t kBoolean[] = L"boolean";
   const wchar_t kInteger[] = L"integer";
   const wchar_t kString[] = L"string";
   prefs.RegisterLocalizedBooleanPref(kBoolean, IDS_LOCALE_BOOL);
   prefs.RegisterLocalizedIntegerPref(kInteger, IDS_LOCALE_INT);
   prefs.RegisterLocalizedStringPref(kString, IDS_LOCALE_STRING);
 
   // The locale default should take preference over the user default.
   EXPECT_FALSE(prefs.GetBoolean(kBoolean));
   EXPECT_EQ(1, prefs.GetInteger(kInteger));
   EXPECT_EQ(L"hello", prefs.GetString(kString));
 
   prefs.SetBoolean(kBoolean, true);
   EXPECT_TRUE(prefs.GetBoolean(kBoolean));
   prefs.SetInteger(kInteger, 5);
   EXPECT_EQ(5, prefs.GetInteger(kInteger));
   prefs.SetString(kString, L"foo");
   EXPECT_EQ(L"foo", prefs.GetString(kString));
 }
+#endif
 
 TEST_F(PrefServiceTest, NoObserverFire) {
   PrefService prefs;
 
   const wchar_t pref_name[] = L"homepage";
   prefs.RegisterStringPref(pref_name, L"");
 
   const std::wstring new_pref_value(L"http://www.google.com/");
   TestPrefObserver obs(&prefs, pref_name, new_pref_value);
   prefs.AddPrefObserver(pref_name, &obs);
@@ skipping 34 matching lines @@
   // Register the path. This doesn't set a value, so the path still shouldn't
   // exist.
   prefs.RegisterStringPref(path, std::wstring());
   EXPECT_FALSE(prefs.HasPrefPath(path));
 
   // Set a value and make sure we have a path.
   prefs.persistent_->SetString(path, L"blah");
   EXPECT_TRUE(prefs.HasPrefPath(path));
 }