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

Side by Side Diff: chrome/browser/first_run/first_run_unittest.cc

Issue 329393004: No longer relaunch into metro mode by default on touch devices. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: delete more code! Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/first_run/first_run.cc ('k') | chrome/browser/process_singleton_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/compiler_specific.h" 6 #include "base/compiler_specific.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/test/scoped_path_override.h" 9 #include "base/test/scoped_path_override.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/first_run/first_run.h" 11 #include "chrome/browser/first_run/first_run.h"
12 #include "chrome/browser/first_run/first_run_internal.h" 12 #include "chrome/browser/first_run/first_run_internal.h"
13 #include "chrome/common/chrome_paths.h" 13 #include "chrome/common/chrome_paths.h"
14 #include "chrome/installer/util/master_preferences.h" 14 #include "chrome/installer/util/master_preferences.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 namespace first_run { 17 namespace first_run {
18 18
19 class FirstRunTest : public testing::Test { 19 class FirstRunTest : public testing::Test {
20 protected: 20 protected:
21 FirstRunTest() : user_data_dir_override_(chrome::DIR_USER_DATA) {} 21 FirstRunTest() : user_data_dir_override_(chrome::DIR_USER_DATA) {}
22 virtual ~FirstRunTest() {} 22 virtual ~FirstRunTest() {}
23 23
24 private: 24 private:
25 base::ScopedPathOverride user_data_dir_override_; 25 base::ScopedPathOverride user_data_dir_override_;
26 26
27 DISALLOW_COPY_AND_ASSIGN(FirstRunTest); 27 DISALLOW_COPY_AND_ASSIGN(FirstRunTest);
28 }; 28 };
29 29
30 TEST_F(FirstRunTest, RemoveSentinel) {
31 base::FilePath sentinel_path;
32 EXPECT_TRUE(internal::GetFirstRunSentinelFilePath(&sentinel_path));
33
34 EXPECT_TRUE(internal::CreateSentinel());
35 EXPECT_TRUE(base::PathExists(sentinel_path));
36
37 EXPECT_TRUE(RemoveSentinel());
38 EXPECT_FALSE(base::PathExists(sentinel_path));
39 }
40
41 TEST_F(FirstRunTest, SetupMasterPrefsFromInstallPrefs_VariationsSeed) { 30 TEST_F(FirstRunTest, SetupMasterPrefsFromInstallPrefs_VariationsSeed) {
42 installer::MasterPreferences install_prefs("{ \"variations_seed\":\"xyz\" }"); 31 installer::MasterPreferences install_prefs("{ \"variations_seed\":\"xyz\" }");
43 EXPECT_EQ(1U, install_prefs.master_dictionary().size()); 32 EXPECT_EQ(1U, install_prefs.master_dictionary().size());
44 33
45 MasterPrefs out_prefs; 34 MasterPrefs out_prefs;
46 internal::SetupMasterPrefsFromInstallPrefs(install_prefs, &out_prefs); 35 internal::SetupMasterPrefsFromInstallPrefs(install_prefs, &out_prefs);
47 EXPECT_EQ("xyz", out_prefs.variations_seed); 36 EXPECT_EQ("xyz", out_prefs.variations_seed);
48 // Variations prefs should have been extracted (removed) from the dictionary. 37 // Variations prefs should have been extracted (removed) from the dictionary.
49 EXPECT_TRUE(install_prefs.master_dictionary().empty()); 38 EXPECT_TRUE(install_prefs.master_dictionary().empty());
50 } 39 }
(...skipping 15 matching lines...) Expand all
66 55
67 MasterPrefs out_prefs; 56 MasterPrefs out_prefs;
68 internal::SetupMasterPrefsFromInstallPrefs(install_prefs, &out_prefs); 57 internal::SetupMasterPrefsFromInstallPrefs(install_prefs, &out_prefs);
69 EXPECT_EQ("xyz", out_prefs.variations_seed); 58 EXPECT_EQ("xyz", out_prefs.variations_seed);
70 EXPECT_EQ("abc", out_prefs.variations_seed_signature); 59 EXPECT_EQ("abc", out_prefs.variations_seed_signature);
71 // Variations prefs should have been extracted (removed) from the dictionary. 60 // Variations prefs should have been extracted (removed) from the dictionary.
72 EXPECT_TRUE(install_prefs.master_dictionary().empty()); 61 EXPECT_TRUE(install_prefs.master_dictionary().empty());
73 } 62 }
74 63
75 } // namespace first_run 64 } // namespace first_run
OLDNEW
« no previous file with comments | « chrome/browser/first_run/first_run.cc ('k') | chrome/browser/process_singleton_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698