Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Side by Side Diff: chrome/browser/supervised_user/supervised_user_browsertest.cc

Issue 454583002: Cleanup: Remove unneeded #includes for grit/, ui/base/l10n/l10n_util.h and ui/base/resource/resourc… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Cros some more 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/strings/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/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
10 #include "chrome/browser/history/history_service_factory.h" 10 #include "chrome/browser/history/history_service_factory.h"
(...skipping 17 matching lines...) Expand all
28 #include "components/infobars/core/confirm_infobar_delegate.h" 28 #include "components/infobars/core/confirm_infobar_delegate.h"
29 #include "components/infobars/core/infobar.h" 29 #include "components/infobars/core/infobar.h"
30 #include "components/pref_registry/pref_registry_syncable.h" 30 #include "components/pref_registry/pref_registry_syncable.h"
31 #include "content/public/browser/interstitial_page.h" 31 #include "content/public/browser/interstitial_page.h"
32 #include "content/public/browser/navigation_controller.h" 32 #include "content/public/browser/navigation_controller.h"
33 #include "content/public/browser/navigation_entry.h" 33 #include "content/public/browser/navigation_entry.h"
34 #include "content/public/browser/notification_service.h" 34 #include "content/public/browser/notification_service.h"
35 #include "content/public/browser/web_contents.h" 35 #include "content/public/browser/web_contents.h"
36 #include "content/public/browser/web_contents_observer.h" 36 #include "content/public/browser/web_contents_observer.h"
37 #include "content/public/test/browser_test_utils.h" 37 #include "content/public/test/browser_test_utils.h"
38 #include "grit/generated_resources.h"
39 #include "testing/gmock/include/gmock/gmock.h" 38 #include "testing/gmock/include/gmock/gmock.h"
40 #include "ui/base/l10n/l10n_util.h"
41 39
42 using content::InterstitialPage; 40 using content::InterstitialPage;
43 using content::NavigationController; 41 using content::NavigationController;
44 using content::NavigationEntry; 42 using content::NavigationEntry;
45 using content::WebContents; 43 using content::WebContents;
46 44
47 namespace { 45 namespace {
48 46
49 // Tests the filter mode in which all sites are blocked by default. 47 // Tests the filter mode in which all sites are blocked by default.
50 class SupervisedUserBlockModeTest : public InProcessBrowserTest { 48 class SupervisedUserBlockModeTest : public InProcessBrowserTest {
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 dict.PassAs<base::Value>()); 303 dict.PassAs<base::Value>());
306 EXPECT_EQ( 304 EXPECT_EQ(
307 SupervisedUserService::MANUAL_ALLOW, 305 SupervisedUserService::MANUAL_ALLOW,
308 supervised_user_service_->GetManualBehaviorForHost(test_url.host())); 306 supervised_user_service_->GetManualBehaviorForHost(test_url.host()));
309 307
310 observer.Wait(); 308 observer.Wait();
311 EXPECT_EQ(test_url, web_contents->GetURL()); 309 EXPECT_EQ(test_url, web_contents->GetURL());
312 } 310 }
313 311
314 } // namespace 312 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/status_icons/status_icon_menu_model.cc ('k') | chrome/browser/sync/sync_ui_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698