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

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

Issue 687903003: Cleanup: Remove unneeded ui_test_utils.h includes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix cros Created 6 years, 1 month 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
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 "chrome/browser/supervised_user/supervised_user_resource_throttle.h" 5 #include "chrome/browser/supervised_user/supervised_user_resource_throttle.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/supervised_user/supervised_user_constants.h" 11 #include "chrome/browser/supervised_user/supervised_user_constants.h"
12 #include "chrome/browser/supervised_user/supervised_user_service.h" 12 #include "chrome/browser/supervised_user/supervised_user_service.h"
13 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" 13 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
14 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" 14 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
15 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h" 15 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h"
16 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "chrome/test/base/in_process_browser_test.h" 18 #include "chrome/test/base/in_process_browser_test.h"
19 #include "chrome/test/base/ui_test_utils.h"
20 #include "content/public/browser/navigation_entry.h" 19 #include "content/public/browser/navigation_entry.h"
21 #include "content/public/browser/web_contents.h" 20 #include "content/public/browser/web_contents.h"
22 #include "content/public/common/page_type.h" 21 #include "content/public/common/page_type.h"
23 #include "content/public/test/test_navigation_observer.h" 22 #include "content/public/test/test_navigation_observer.h"
24 #include "content/public/test/test_utils.h" 23 #include "content/public/test/test_utils.h"
25 24
26 using content::MessageLoopRunner; 25 using content::MessageLoopRunner;
27 using content::NavigationController; 26 using content::NavigationController;
28 using content::WebContents; 27 using content::WebContents;
29 28
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 WebContents::Create(WebContents::CreateParams(profile))); 64 WebContents::Create(WebContents::CreateParams(profile)));
66 NavigationController& controller = web_contents->GetController(); 65 NavigationController& controller = web_contents->GetController();
67 content::TestNavigationObserver observer(web_contents.get()); 66 content::TestNavigationObserver observer(web_contents.get());
68 controller.LoadURL(GURL("http://www.example.com"), content::Referrer(), 67 controller.LoadURL(GURL("http://www.example.com"), content::Referrer(),
69 ui::PAGE_TRANSITION_TYPED, std::string()); 68 ui::PAGE_TRANSITION_TYPED, std::string());
70 observer.Wait(); 69 observer.Wait();
71 content::NavigationEntry* entry = controller.GetActiveEntry(); 70 content::NavigationEntry* entry = controller.GetActiveEntry();
72 ASSERT_TRUE(entry); 71 ASSERT_TRUE(entry);
73 EXPECT_EQ(content::PAGE_TYPE_INTERSTITIAL, entry->GetPageType()); 72 EXPECT_EQ(content::PAGE_TYPE_INTERSTITIAL, entry->GetPageType());
74 } 73 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_client_certificate_selector_test.cc ('k') | chrome/browser/sync/test/integration/bookmarks_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698