chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix bad merge Created 6 years, 3 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/ui/network_profile_bubble.cc ('k') | chrome/browser/ui/settings_window_manager_browsertest.cc » ('j') | no next file with comments »

OLD	NEW
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/files/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"

11 #include "chrome/common/chrome_paths.h"	11 #include "chrome/common/chrome_paths.h"

12 #include "chrome/common/pref_names.h"	12 #include "chrome/common/pref_names.h"

13 #include "chrome/test/base/in_process_browser_test.h"	13 #include "chrome/test/base/in_process_browser_test.h"

14 #include "chrome/test/base/testing_profile.h"	14 #include "chrome/test/base/testing_profile.h"

15	15

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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

OLD	NEW