chrome/browser/managed_mode/managed_user_service_unittest.cc - Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2.

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/managed_mode/managed_user_service_unittest.cc

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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/managed_mode/managed_user_service.cc ('k') | chrome/browser/media/media_capture_devices_dispatcher.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/path_service.h"	5 #include "base/path_service.h"

6 #include "base/prefs/pref_service.h"	6 #include "base/prefs/pref_service.h"

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

8 #include "chrome/browser/extensions/extension_service_unittest.h"	8 #include "chrome/browser/extensions/extension_service_unittest.h"

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

10 #include "chrome/browser/managed_mode/managed_user_service.h"	10 #include "chrome/browser/managed_mode/managed_user_service.h"

11 #include "chrome/browser/managed_mode/managed_user_service_factory.h"	11 #include "chrome/browser/managed_mode/managed_user_service_factory.h"

12 #include "chrome/browser/prefs/scoped_user_pref_update.h"	12 #include "chrome/browser/prefs/scoped_user_pref_update.h"

13 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/browser/ui/browser_list.h"	14 #include "chrome/browser/ui/browser_list.h"

15 #include "chrome/common/chrome_notification_types.h"	15 #include "chrome/common/chrome_notification_types.h"

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

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

(...skipping 285 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
303	303

304 EXPECT_EQ(ManagedModeURLFilter::WARN,	304 EXPECT_EQ(ManagedModeURLFilter::WARN,

305 url_filter->GetFilteringBehaviorForURL(example_url));	305 url_filter->GetFilteringBehaviorForURL(example_url));

306 #if defined(ENABLE_CONFIGURATION_POLICY)	306 #if defined(ENABLE_CONFIGURATION_POLICY)

307 EXPECT_EQ(ManagedModeURLFilter::ALLOW,	307 EXPECT_EQ(ManagedModeURLFilter::ALLOW,

308 url_filter->GetFilteringBehaviorForURL(moose_url));	308 url_filter->GetFilteringBehaviorForURL(moose_url));

309 #endif	309 #endif

310 }	310 }

311	311

312 #endif // OS_CHROMEOS	312 #endif // OS_CHROMEOS

OLD	NEW