chrome/browser/prefs/chrome_pref_service_unittest.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/prefs/chrome_pref_service_unittest.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, 4 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/predictors/predictor_database.cc ('k') | chrome/browser/prefs/leveldb_pref_store.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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/command_line.h"	5 #include "base/command_line.h"

6 #include "base/file_util.h"	6 #include "base/files/file_util.h"

7 #include "base/files/scoped_temp_dir.h"	7 #include "base/files/scoped_temp_dir.h"

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "base/path_service.h"	9 #include "base/path_service.h"

10 #include "base/prefs/pref_registry_simple.h"	10 #include "base/prefs/pref_registry_simple.h"

11 #include "base/prefs/scoped_user_pref_update.h"	11 #include "base/prefs/scoped_user_pref_update.h"

12 #include "base/strings/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

13 #include "base/values.h"	13 #include "base/values.h"

14 #include "chrome/browser/prefs/browser_prefs.h"	14 #include "chrome/browser/prefs/browser_prefs.h"

15 #include "chrome/browser/prefs/command_line_pref_store.h"	15 #include "chrome/browser/prefs/command_line_pref_store.h"

16 #include "chrome/browser/prefs/pref_service_mock_factory.h"	16 #include "chrome/browser/prefs/pref_service_mock_factory.h"

(...skipping 113 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
130 const char kDefaultFont[] = "Times";	130 const char kDefaultFont[] = "Times";

131 #elif defined(OS_CHROMEOS)	131 #elif defined(OS_CHROMEOS)

132 const char kDefaultFont[] = "Tinos";	132 const char kDefaultFont[] = "Tinos";

133 #else	133 #else

134 const char kDefaultFont[] = "Times New Roman";	134 const char kDefaultFont[] = "Times New Roman";

135 #endif	135 #endif

136 EXPECT_EQ(base::ASCIIToUTF16(kDefaultFont),	136 EXPECT_EQ(base::ASCIIToUTF16(kDefaultFont),

137 webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]);	137 webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]);

138 EXPECT_TRUE(webkit_prefs.javascript_enabled);	138 EXPECT_TRUE(webkit_prefs.javascript_enabled);

139 }	139 }

OLD	NEW