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

Side by Side Diff: chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc

Issue 100573002: Move directory creation functions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/file_util.h" 5 #include "base/file_util.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/common/chrome_constants.h" 10 #include "chrome/common/chrome_constants.h"
(...skipping 12 matching lines...) Expand all
23 .AppendASCII("web_prefs") 23 .AppendASCII("web_prefs")
24 .AppendASCII("Default") 24 .AppendASCII("Default")
25 .Append(chrome::kPreferencesFilename); 25 .Append(chrome::kPreferencesFilename);
26 } 26 }
27 27
28 virtual bool SetUpUserDataDirectory() OVERRIDE { 28 virtual bool SetUpUserDataDirectory() OVERRIDE {
29 base::FilePath user_data_directory; 29 base::FilePath user_data_directory;
30 PathService::Get(chrome::DIR_USER_DATA, &user_data_directory); 30 PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
31 base::FilePath default_profile = 31 base::FilePath default_profile =
32 user_data_directory.AppendASCII(TestingProfile::kTestUserProfileDir); 32 user_data_directory.AppendASCII(TestingProfile::kTestUserProfileDir);
33 if (!file_util::CreateDirectory(default_profile)) { 33 if (!base::CreateDirectory(default_profile)) {
34 LOG(ERROR) << "Can't create " << default_profile.MaybeAsASCII(); 34 LOG(ERROR) << "Can't create " << default_profile.MaybeAsASCII();
35 return false; 35 return false;
36 } 36 }
37 base::FilePath pref_file = GetPreferencesFilePath(); 37 base::FilePath pref_file = GetPreferencesFilePath();
38 if (!base::PathExists(pref_file)) { 38 if (!base::PathExists(pref_file)) {
39 LOG(ERROR) << "Doesn't exist " << pref_file.MaybeAsASCII(); 39 LOG(ERROR) << "Doesn't exist " << pref_file.MaybeAsASCII();
40 return false; 40 return false;
41 } 41 }
42 base::FilePath default_pref_file = 42 base::FilePath default_pref_file =
43 default_profile.Append(chrome::kPreferencesFilename); 43 default_profile.Append(chrome::kPreferencesFilename);
(...skipping 27 matching lines...) Expand all
71 71
72 EXPECT_EQ("ISO-8859-1", prefs->GetString(prefs::kDefaultCharset)); 72 EXPECT_EQ("ISO-8859-1", prefs->GetString(prefs::kDefaultCharset));
73 EXPECT_EQ(16, prefs->GetInteger(prefs::kWebKitDefaultFontSize)); 73 EXPECT_EQ(16, prefs->GetInteger(prefs::kWebKitDefaultFontSize));
74 EXPECT_EQ("Nanum Gothic", 74 EXPECT_EQ("Nanum Gothic",
75 prefs->GetString(prefs::kWebKitStandardFontFamilyKorean)); 75 prefs->GetString(prefs::kWebKitStandardFontFamilyKorean));
76 EXPECT_EQ("Tinos", prefs->GetString(prefs::kWebKitStandardFontFamily)); 76 EXPECT_EQ("Tinos", prefs->GetString(prefs::kWebKitStandardFontFamily));
77 EXPECT_EQ("DejaVu Sans", prefs->GetString(prefs::kWebKitSansSerifFontFamily)); 77 EXPECT_EQ("DejaVu Sans", prefs->GetString(prefs::kWebKitSansSerifFontFamily));
78 }; 78 };
79 79
80 80
OLDNEW
« no previous file with comments | « chrome/browser/ui/metro_pin_tab_helper_win.cc ('k') | chrome/browser/ui/views/app_list/win/app_list_service_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698