Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2024)

Unified Diff: chrome/browser/first_run/first_run_unittest.cc

Issue 208393020: Fix the new First Run sentinel file path determination. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and rebase; re-upload to kick CQ. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/first_run/first_run_unittest.cc
diff --git a/chrome/browser/first_run/first_run_unittest.cc b/chrome/browser/first_run/first_run_unittest.cc
index bccc9e82ceb6817596c4a88a0539fcc70b9c690f..c5e0c70a149b418e02466ef5befd55015da9bf30 100644
--- a/chrome/browser/first_run/first_run_unittest.cc
+++ b/chrome/browser/first_run/first_run_unittest.cc
@@ -21,12 +21,6 @@ class FirstRunTest : public testing::Test {
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_;
@@ -34,11 +28,14 @@ class FirstRunTest : public testing::Test {
};
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) {

Powered by Google App Engine
This is Rietveld 408576698