chrome/browser/managed_mode/managed_mode_browsertest.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_mode_browsertest.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/jumplist_win.cc ('k') | chrome/browser/managed_mode/managed_mode_interstitial.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/command_line.h"	5 #include "base/command_line.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 "base/values.h"	8 #include "base/values.h"

9 #include "chrome/browser/common/cancelable_request.h"	9 #include "chrome/browser/common/cancelable_request.h"

10 #include "chrome/browser/history/history_service_factory.h"	10 #include "chrome/browser/history/history_service_factory.h"

11 #include "chrome/browser/infobars/confirm_infobar_delegate.h"	11 #include "chrome/browser/infobars/confirm_infobar_delegate.h"

12 #include "chrome/browser/infobars/infobar.h"	12 #include "chrome/browser/infobars/infobar.h"

13 #include "chrome/browser/infobars/infobar_service.h"	13 #include "chrome/browser/infobars/infobar_service.h"

14 #include "chrome/browser/managed_mode/managed_mode.h"	14 #include "chrome/browser/managed_mode/managed_mode.h"

15 #include "chrome/browser/managed_mode/managed_mode_interstitial.h"	15 #include "chrome/browser/managed_mode/managed_mode_interstitial.h"

16 #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"	16 #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"

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

(...skipping 210 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
228	228

229 // Check that the entries have the correct blocked_visit value.	229 // Check that the entries have the correct blocked_visit value.

230 EXPECT_EQ(2u, results.size());	230 EXPECT_EQ(2u, results.size());

231 EXPECT_EQ(blocked_url.spec(), results[0].url().spec());	231 EXPECT_EQ(blocked_url.spec(), results[0].url().spec());

232 EXPECT_TRUE(results[0].blocked_visit());	232 EXPECT_TRUE(results[0].blocked_visit());

233 EXPECT_EQ(allowed_url.spec(), results[1].url().spec());	233 EXPECT_EQ(allowed_url.spec(), results[1].url().spec());

234 EXPECT_FALSE(results[1].blocked_visit());	234 EXPECT_FALSE(results[1].blocked_visit());

235 }	235 }

236	236

237 } // namespace	237 } // namespace

OLD	NEW