Remove user-related data from local_state and add to user_preferences, i...

chrome/browser/prefs/pref_service_uitest.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/test/test_file_util.h"
 #include "base/values.h"
@@ skipping 14 matching lines @@
     tmp_profile_ = tmp_profile_.AppendASCII("tmp_profile");
 
     // Create a fresh, empty copy of this directory.
     file_util::Delete(tmp_profile_, true);
     file_util::CreateDirectory(tmp_profile_);
 
     FilePath reference_pref_file =
         test_data_directory_
             .AppendASCII("profiles")
             .AppendASCII("window_placement")
-            .Append(chrome::kLocalStateFilename);
+            .AppendASCII("Default")
+            .Append(chrome::kPreferencesFilename);
 
-    tmp_pref_file_ = tmp_profile_.Append(chrome::kLocalStateFilename);
+    tmp_pref_file_ = tmp_profile_.AppendASCII("Default");
 
+    ASSERT_TRUE(file_util::CreateDirectory(tmp_pref_file_));
+
+    tmp_pref_file_ = tmp_pref_file_.Append(chrome::kPreferencesFilename);
     ASSERT_TRUE(file_util::PathExists(reference_pref_file));
-
-    // Copy only the Local State file, the rest will be automatically created
+    // Copy only the Preferences file, the rest will be automatically created.
     ASSERT_TRUE(file_util::CopyFile(reference_pref_file, tmp_pref_file_));
 
 #if defined(OS_WIN)
     // Make the copy writable.  On POSIX we assume the umask allows files
     // we create to be writable.
     ASSERT_TRUE(::SetFileAttributesW(tmp_pref_file_.value().c_str(),
         FILE_ATTRIBUTE_NORMAL));
 #endif
 
     launch_arguments_.AppendSwitchPath(switches::kUserDataDir, tmp_profile_);
@@ skipping 10 matching lines @@
     UITest::TearDown();
 
     EXPECT_TRUE(file_util::DieFileDie(tmp_profile_, true));
   }
 
  public:
   FilePath tmp_pref_file_;
   FilePath tmp_profile_;
 };
 
-#if defined(OS_WIN)
+#if !defined(OS_LINUX)
 // This test verifies that the window position from the prefs file is restored
 // when the app restores.  This doesn't really make sense on Linux, where
 // the window manager might fight with you over positioning.  However, we
 // might be able to make this work on buildbots.
-// Also, not sure what should happen on the mac.  In any case, the code below
-// (minus the Windows bits) compiles fine on my Linux box now.
 // TODO(port): revisit this.
 TEST_F(PreferenceServiceTest, PreservedWindowPlacementIsLoaded) {
   // The window should open with the reference profile
   ASSERT_TRUE(LaunchAppWithProfile());
-
   ASSERT_TRUE(file_util::PathExists(tmp_pref_file_));
 
   JSONFileValueSerializer deserializer(tmp_pref_file_);
   scoped_ptr<Value> root(deserializer.Deserialize(NULL, NULL));
 
   ASSERT_TRUE(root.get());
   ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY));
 
   DictionaryValue* root_dict = static_cast<DictionaryValue*>(root.get());
 
@@ skipping 30 matching lines @@
 
   // Find if launched window is maximized.
   bool is_window_maximized = false;
   ASSERT_TRUE(window->IsMaximized(&is_window_maximized));
   bool is_maximized = false;
   EXPECT_TRUE(root_dict->GetBoolean(kBrowserWindowPlacement + ".maximized",
       &is_maximized));
   EXPECT_EQ(is_maximized, is_window_maximized);
 }
 #endif