Support variations_seed parameter in MasterPrefs.

chrome/browser/first_run/first_run_unittest.cc

 // 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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/test/scoped_path_override.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/first_run/first_run_internal.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/installer/util/master_preferences.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace first_run {

[gab, 2013/02/11 23:44:01]

I don't remember seeing tests inside a namespace in Chromium. Usually the tests
for a class in a namespace are not in the namespace (this has often struck me in
current code as it makes the test code convoluted with namespace prefixes) -- I
don't know if there is a good reason for that however... can you find examples
of other tests that are written inside their corresponding namespaces?

[Alexei Svitkine (slow), 2013/02/12 00:11:31]

Sure, for example the majority of tests under gfx/ do this (and have been moving
to this direction more recently):

cat ui/gfx/*test.cc | grep -c "namespace gfx"
41

[gab, 2013/02/12 00:31:06]

Sounds good, I personally prefer this syntax too FWIW :)!

+
 class FirstRunTest : public testing::Test {
  protected:
   FirstRunTest() : user_data_dir_override_(chrome::DIR_USER_DATA) {}
   virtual ~FirstRunTest() {}
 
   virtual void SetUp() OVERRIDE {
-    first_run::internal::GetFirstRunSentinelFilePath(&sentinel_path_);
+    internal::GetFirstRunSentinelFilePath(&sentinel_path_);
   }
 
   base::FilePath sentinel_path_;
 
  private:
   base::ScopedPathOverride user_data_dir_override_;
 
   DISALLOW_COPY_AND_ASSIGN(FirstRunTest);
 };
 
 TEST_F(FirstRunTest, RemoveSentinel) {
-  EXPECT_TRUE(first_run::CreateSentinel());
+  EXPECT_TRUE(CreateSentinel());
   EXPECT_TRUE(file_util::PathExists(sentinel_path_));
 
-  EXPECT_TRUE(first_run::RemoveSentinel());
+  EXPECT_TRUE(RemoveSentinel());
   EXPECT_FALSE(file_util::PathExists(sentinel_path_));
 }
+
+TEST_F(FirstRunTest, SetupMasterPrefsFromInstallPrefs_VariationsSeed) {
+  installer::MasterPreferences install_prefs("{ \"variations_seed\":\"xyz\" }");
+
+  MasterPrefs out_prefs;
+  internal::SetupMasterPrefsFromInstallPrefs(install_prefs, &out_prefs);
+  EXPECT_EQ("xyz", out_prefs.variations_seed);
+}
+
+}  // namespace first_run

[gab, 2013/02/11 23:44:01]

nit: Does this file end with a new line? The linter seems to think it doesn't,
but it's often wrong...

[Alexei Svitkine (slow), 2013/02/12 00:11:31]

No, it's a rietveld bug.