Fix the new First Run sentinel file path determination.

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 "base/values.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 {
 
 class FirstRunTest : public testing::Test {
  protected:
   FirstRunTest() : user_data_dir_override_(chrome::DIR_USER_DATA) {}
   virtual ~FirstRunTest() {}
 
-  virtual void SetUp() OVERRIDE {
-    internal::GetFirstRunSentinelFilePath(&sentinel_path_);
-  }
-
-  base::FilePath sentinel_path_;
-
  private:
   base::ScopedPathOverride user_data_dir_override_;
 
   DISALLOW_COPY_AND_ASSIGN(FirstRunTest);
 };
 
 TEST_F(FirstRunTest, RemoveSentinel) {
+  base::FilePath sentinel_path;
+  EXPECT_TRUE(internal::GetFirstRunSentinelFilePath(&sentinel_path));
+
   EXPECT_TRUE(internal::CreateSentinel());
-  EXPECT_TRUE(base::PathExists(sentinel_path_));
+  EXPECT_TRUE(base::PathExists(sentinel_path));
 
   EXPECT_TRUE(RemoveSentinel());
-  EXPECT_FALSE(base::PathExists(sentinel_path_));
+  EXPECT_FALSE(base::PathExists(sentinel_path));
 }
 
 TEST_F(FirstRunTest, SetupMasterPrefsFromInstallPrefs_VariationsSeed) {
   installer::MasterPreferences install_prefs("{ \"variations_seed\":\"xyz\" }");
   EXPECT_EQ(1U, install_prefs.master_dictionary().size());
 
   MasterPrefs out_prefs;
   internal::SetupMasterPrefsFromInstallPrefs(install_prefs, &out_prefs);
   EXPECT_EQ("xyz", out_prefs.variations_seed);
   // Variations prefs should have been extracted (removed) from the dictionary.
@@ skipping 17 matching lines @@
 
   MasterPrefs out_prefs;
   internal::SetupMasterPrefsFromInstallPrefs(install_prefs, &out_prefs);
   EXPECT_EQ("xyz", out_prefs.variations_seed);
   EXPECT_EQ("abc", out_prefs.variations_seed_signature);
   // Variations prefs should have been extracted (removed) from the dictionary.
   EXPECT_TRUE(install_prefs.master_dictionary().empty());
 }
 
 }  // namespace first_run