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

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

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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
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"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 supervised_user_settings_service->SetLocalSettingForTesting( 59 supervised_user_settings_service->SetLocalSettingForTesting(
60 supervised_users::kContentPackDefaultFilteringBehavior, 60 supervised_users::kContentPackDefaultFilteringBehavior,
61 scoped_ptr<base::Value>( 61 scoped_ptr<base::Value>(
62 new base::FundamentalValue(SupervisedUserURLFilter::BLOCK))); 62 new base::FundamentalValue(SupervisedUserURLFilter::BLOCK)));
63 63
64 scoped_ptr<WebContents> web_contents( 64 scoped_ptr<WebContents> web_contents(
65 WebContents::Create(WebContents::CreateParams(profile))); 65 WebContents::Create(WebContents::CreateParams(profile)));
66 NavigationController& controller = web_contents->GetController(); 66 NavigationController& controller = web_contents->GetController();
67 content::TestNavigationObserver observer(web_contents.get()); 67 content::TestNavigationObserver observer(web_contents.get());
68 controller.LoadURL(GURL("http://www.example.com"), content::Referrer(), 68 controller.LoadURL(GURL("http://www.example.com"), content::Referrer(),
69 content::PAGE_TRANSITION_TYPED, std::string()); 69 ui::PAGE_TRANSITION_TYPED, std::string());
70 observer.Wait(); 70 observer.Wait();
71 content::NavigationEntry* entry = controller.GetActiveEntry(); 71 content::NavigationEntry* entry = controller.GetActiveEntry();
72 ASSERT_TRUE(entry); 72 ASSERT_TRUE(entry);
73 EXPECT_EQ(content::PAGE_TYPE_INTERSTITIAL, entry->GetPageType()); 73 EXPECT_EQ(content::PAGE_TYPE_INTERSTITIAL, entry->GetPageType());
74 } 74 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698