chrome/browser/themes/theme_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/themes/theme_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

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 "chrome/browser/themes/theme_service.h"	5 #include "chrome/browser/themes/theme_service.h"

6	6

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

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

9 #include "chrome/browser/chrome_notification_types.h"	9 #include "chrome/browser/chrome_notification_types.h"

10 #include "chrome/browser/extensions/extension_service.h"	10 #include "chrome/browser/extensions/extension_service.h"

11 #include "chrome/browser/extensions/extension_service_test_base.h"	11 #include "chrome/browser/extensions/extension_service_test_base.h"

12 #include "chrome/browser/extensions/unpacked_installer.h"	12 #include "chrome/browser/extensions/unpacked_installer.h"

13 #include "chrome/browser/supervised_user/supervised_user_service.h"	13 #include "chrome/browser/supervised_user/supervised_user_service.h"

14 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"	14 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"

15 #include "chrome/browser/themes/custom_theme_supplier.h"	15 #include "chrome/browser/themes/custom_theme_supplier.h"

16 #include "chrome/browser/themes/theme_service_factory.h"	16 #include "chrome/browser/themes/theme_service_factory.h"

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

(...skipping 248 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
266 ThemeServiceFactory::GetForProfile(profile_.get());	266 ThemeServiceFactory::GetForProfile(profile_.get());

267 theme_service->UseDefaultTheme();	267 theme_service->UseDefaultTheme();

268 EXPECT_TRUE(theme_service->UsingDefaultTheme());	268 EXPECT_TRUE(theme_service->UsingDefaultTheme());

269 EXPECT_TRUE(get_theme_supplier(theme_service));	269 EXPECT_TRUE(get_theme_supplier(theme_service));

270 EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(),	270 EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(),

271 CustomThemeSupplier::SUPERVISED_USER_THEME);	271 CustomThemeSupplier::SUPERVISED_USER_THEME);

272 }	272 }

273 #endif	273 #endif

274	274

275 }; // namespace theme_service_internal	275 }; // namespace theme_service_internal

OLD	NEW