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

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

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 15 matching lines...) Expand all
26 using content::MessageLoopRunner; 26 using content::MessageLoopRunner;
27 using content::NavigationController; 27 using content::NavigationController;
28 using content::WebContents; 28 using content::WebContents;
29 29
30 class SupervisedUserResourceThrottleTest : public InProcessBrowserTest { 30 class SupervisedUserResourceThrottleTest : public InProcessBrowserTest {
31 protected: 31 protected:
32 SupervisedUserResourceThrottleTest() : supervised_user_service_(NULL) {} 32 SupervisedUserResourceThrottleTest() : supervised_user_service_(NULL) {}
33 virtual ~SupervisedUserResourceThrottleTest() {} 33 virtual ~SupervisedUserResourceThrottleTest() {}
34 34
35 private: 35 private:
36 virtual void SetUpOnMainThread() OVERRIDE; 36 virtual void SetUpOnMainThread() override;
37 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; 37 virtual void SetUpCommandLine(CommandLine* command_line) override;
38 38
39 SupervisedUserService* supervised_user_service_; 39 SupervisedUserService* supervised_user_service_;
40 }; 40 };
41 41
42 void SupervisedUserResourceThrottleTest::SetUpOnMainThread() { 42 void SupervisedUserResourceThrottleTest::SetUpOnMainThread() {
43 supervised_user_service_ = 43 supervised_user_service_ =
44 SupervisedUserServiceFactory::GetForProfile(browser()->profile()); 44 SupervisedUserServiceFactory::GetForProfile(browser()->profile());
45 } 45 }
46 46
47 void SupervisedUserResourceThrottleTest::SetUpCommandLine( 47 void SupervisedUserResourceThrottleTest::SetUpCommandLine(
(...skipping 17 matching lines...) Expand all
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 ui::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