No longer register app window placement preference keys on the fly.

chrome/browser/prefs/pref_service_browsertest.cc

Index: chrome/browser/prefs/pref_service_browsertest.cc
diff --git a/chrome/browser/prefs/pref_service_browsertest.cc b/chrome/browser/prefs/pref_service_browsertest.cc
index 496af8161c86dac7e2601a20cc08a6f026343b48..d10b7f7510b87a13ec779f93beba05cf89a390d8 100644
--- a/chrome/browser/prefs/pref_service_browsertest.cc
+++ b/chrome/browser/prefs/pref_service_browsertest.cc
@@ -12,6 +12,7 @@
 #include "base/test/test_file_util.h"
 #include "base/values.h"
 #include "build/build_config.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/browser_window_state.h"
@@ -227,3 +228,40 @@ IN_PROC_BROWSER_TEST_F(PreservedWindowPlacementIsMigrated, Test) {
   EXPECT_EQ(is_maximized, is_window_maximized);
 }
 #endif
+
+class AppWindowPlacementIsMigrated : public InProcessBrowserTest {
+ public:
+  virtual bool SetUpUserDataDirectory() OVERRIDE {
+    base::FilePath user_data_directory;
+    PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
+
+    base::FilePath original_pref_file = ui_test_utils::GetTestFilePath(
+        base::FilePath().AppendASCII("profiles").

[Bernhard Bauer, 2014/09/04 11:06:02]

An alternative to FilePath().AppendASCII("...") would be to use
FilePath(FILE_PATH_LITERAL("...")). Sometimes it's abbreviated via an #ifdef to
FPL.

[dgrogan, 2014/09/04 20:26:33]

Done. I suppose the advantage to the way you suggest is that it's not clear what
is meant to call AppendASCII("whatever") on a newly constructed FilePath object
that had no parameters. Though then you have situations like this one where
using FILE_PATH_LITERAL causes an inconsistency between how the first directory
is appended vs how the rest of the directories are appended which seems
confusing, at least to me. And base::FilePath().AppendASCII is alive and well in
chromium:

https://code.google.com/p/chromium/codesearch#search/&q=FilePath%5C(%5C)%5C.A...

I'm going to leave this to use FILE_PATH_LITERAL as you suggest because, despite
evidence to the contrary, I don't really care.

+                   AppendASCII("app_window_placement").
+                   AppendASCII("Default"),
+        base::FilePath().Append(chrome::kPreferencesFilename));
+    base::FilePath tmp_pref_file =
+        user_data_directory.AppendASCII(TestingProfile::kTestUserProfileDir);
+    CHECK(base::CreateDirectory(tmp_pref_file));
+    tmp_pref_file = tmp_pref_file.Append(chrome::kPreferencesFilename);
+    CHECK(base::PathExists(original_pref_file));
+    CHECK(base::CopyFile(original_pref_file, tmp_pref_file));
+    return true;
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(AppWindowPlacementIsMigrated, Test) {
+  PrefService* prefs = browser()->profile()->GetPrefs();
+  const base::DictionaryValue* browser_placement =
+      prefs->GetDictionary(prefs::kBrowserWindowPlacement);
+  EXPECT_NE(browser_placement, static_cast<base::DictionaryValue*>(NULL));

[Bernhard Bauer, 2014/09/04 11:06:02]

Put the expected value first for a nicer error message when the check fails.

[dgrogan, 2014/09/04 20:26:33]

Done.

+
+  const base::DictionaryValue* app_windows =
+      prefs->GetDictionary(prefs::kAppWindowPlacement);
+  EXPECT_NE(app_windows, static_cast<base::DictionaryValue*>(NULL));
+  const base::DictionaryValue* dev_tools_dict = NULL;
+  app_windows->GetDictionary(DevToolsWindow::kDevToolsApp, &dev_tools_dict);
+  int right;
+  EXPECT_TRUE(dev_tools_dict->GetInteger("right", &right));
+  EXPECT_EQ(721, right);
+}