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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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/files/file_util.h" 5 #include "base/files/file_util.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/prefs/pref_service.h"
8 #include "build/build_config.h" 7 #include "build/build_config.h"
9 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
11 #include "chrome/common/chrome_constants.h" 10 #include "chrome/common/chrome_constants.h"
12 #include "chrome/common/chrome_paths.h" 11 #include "chrome/common/chrome_paths.h"
13 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
14 #include "chrome/test/base/in_process_browser_test.h" 13 #include "chrome/test/base/in_process_browser_test.h"
15 #include "chrome/test/base/testing_profile.h" 14 #include "chrome/test/base/testing_profile.h"
15 #include "components/prefs/pref_service.h"
16 16
17 class PrefsTabHelperBrowserTest : public InProcessBrowserTest { 17 class PrefsTabHelperBrowserTest : public InProcessBrowserTest {
18 protected: 18 protected:
19 virtual base::FilePath GetPreferencesFilePath() { 19 virtual base::FilePath GetPreferencesFilePath() {
20 base::FilePath test_data_directory; 20 base::FilePath test_data_directory;
21 PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory); 21 PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory);
22 return test_data_directory 22 return test_data_directory
23 .AppendASCII("profiles") 23 .AppendASCII("profiles")
24 .AppendASCII("web_prefs") 24 .AppendASCII("web_prefs")
25 .AppendASCII("Default") 25 .AppendASCII("Default")
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 EXPECT_EQ("windows-1251", prefs->GetString(prefs::kDefaultCharset)); 73 EXPECT_EQ("windows-1251", prefs->GetString(prefs::kDefaultCharset));
74 EXPECT_EQ(16, prefs->GetInteger(prefs::kWebKitDefaultFontSize)); 74 EXPECT_EQ(16, prefs->GetInteger(prefs::kWebKitDefaultFontSize));
75 EXPECT_EQ("Nanum Gothic", 75 EXPECT_EQ("Nanum Gothic",
76 prefs->GetString(prefs::kWebKitStandardFontFamilyKorean)); 76 prefs->GetString(prefs::kWebKitStandardFontFamilyKorean));
77 EXPECT_EQ("Tinos", prefs->GetString(prefs::kWebKitStandardFontFamily)); 77 EXPECT_EQ("Tinos", prefs->GetString(prefs::kWebKitStandardFontFamily));
78 EXPECT_EQ("DejaVu Sans", prefs->GetString(prefs::kWebKitSansSerifFontFamily)); 78 EXPECT_EQ("DejaVu Sans", prefs->GetString(prefs::kWebKitSansSerifFontFamily));
79 }; 79 };
80 80
81 81
OLDNEW
« no previous file with comments | « chrome/browser/ui/prefs/prefs_tab_helper.cc ('k') | chrome/browser/ui/search/instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698