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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_service_unittest.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 "base/path_service.h" 5 #include "base/path_service.h"
6 #include "base/prefs/pref_service.h" 6 #include "base/prefs/pref_service.h"
7 #include "base/prefs/scoped_user_pref_update.h" 7 #include "base/prefs/scoped_user_pref_update.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 ~SupervisedUserURLFilterObserver() { 50 ~SupervisedUserURLFilterObserver() {
51 url_filter_->RemoveObserver(this); 51 url_filter_->RemoveObserver(this);
52 } 52 }
53 53
54 void Wait() { 54 void Wait() {
55 message_loop_runner_->Run(); 55 message_loop_runner_->Run();
56 Reset(); 56 Reset();
57 } 57 }
58 58
59 // SupervisedUserURLFilter::Observer 59 // SupervisedUserURLFilter::Observer
60 virtual void OnSiteListUpdated() OVERRIDE { 60 virtual void OnSiteListUpdated() override {
61 message_loop_runner_->Quit(); 61 message_loop_runner_->Quit();
62 } 62 }
63 63
64 private: 64 private:
65 void Reset() { 65 void Reset() {
66 message_loop_runner_ = new MessageLoopRunner; 66 message_loop_runner_ = new MessageLoopRunner;
67 } 67 }
68 68
69 SupervisedUserURLFilter* url_filter_; 69 SupervisedUserURLFilter* url_filter_;
70 scoped_refptr<MessageLoopRunner> message_loop_runner_; 70 scoped_refptr<MessageLoopRunner> message_loop_runner_;
71 }; 71 };
72 72
73 class SupervisedUserServiceTest : public ::testing::Test { 73 class SupervisedUserServiceTest : public ::testing::Test {
74 public: 74 public:
75 SupervisedUserServiceTest() {} 75 SupervisedUserServiceTest() {}
76 76
77 virtual void SetUp() OVERRIDE { 77 virtual void SetUp() override {
78 TestingProfile::Builder builder; 78 TestingProfile::Builder builder;
79 builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(), 79 builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(),
80 BuildFakeProfileOAuth2TokenService); 80 BuildFakeProfileOAuth2TokenService);
81 profile_ = builder.Build(); 81 profile_ = builder.Build();
82 supervised_user_service_ = 82 supervised_user_service_ =
83 SupervisedUserServiceFactory::GetForProfile(profile_.get()); 83 SupervisedUserServiceFactory::GetForProfile(profile_.get());
84 } 84 }
85 85
86 virtual void TearDown() OVERRIDE { 86 virtual void TearDown() override {
87 profile_.reset(); 87 profile_.reset();
88 } 88 }
89 89
90 virtual ~SupervisedUserServiceTest() {} 90 virtual ~SupervisedUserServiceTest() {}
91 91
92 protected: 92 protected:
93 content::TestBrowserThreadBundle thread_bundle_; 93 content::TestBrowserThreadBundle thread_bundle_;
94 scoped_ptr<TestingProfile> profile_; 94 scoped_ptr<TestingProfile> profile_;
95 SupervisedUserService* supervised_user_service_; 95 SupervisedUserService* supervised_user_service_;
96 }; 96 };
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 173
174 #if !defined(OS_ANDROID) 174 #if !defined(OS_ANDROID)
175 class SupervisedUserServiceExtensionTestBase 175 class SupervisedUserServiceExtensionTestBase
176 : public extensions::ExtensionServiceTestBase { 176 : public extensions::ExtensionServiceTestBase {
177 public: 177 public:
178 explicit SupervisedUserServiceExtensionTestBase(bool is_supervised) 178 explicit SupervisedUserServiceExtensionTestBase(bool is_supervised)
179 : is_supervised_(is_supervised), 179 : is_supervised_(is_supervised),
180 channel_(chrome::VersionInfo::CHANNEL_DEV) {} 180 channel_(chrome::VersionInfo::CHANNEL_DEV) {}
181 virtual ~SupervisedUserServiceExtensionTestBase() {} 181 virtual ~SupervisedUserServiceExtensionTestBase() {}
182 182
183 virtual void SetUp() OVERRIDE { 183 virtual void SetUp() override {
184 ExtensionServiceTestBase::SetUp(); 184 ExtensionServiceTestBase::SetUp();
185 ExtensionServiceTestBase::ExtensionServiceInitParams params = 185 ExtensionServiceTestBase::ExtensionServiceInitParams params =
186 CreateDefaultInitParams(); 186 CreateDefaultInitParams();
187 params.profile_is_supervised = is_supervised_; 187 params.profile_is_supervised = is_supervised_;
188 InitializeExtensionService(params); 188 InitializeExtensionService(params);
189 SupervisedUserServiceFactory::GetForProfile(profile_.get())->Init(); 189 SupervisedUserServiceFactory::GetForProfile(profile_.get())->Init();
190 } 190 }
191 191
192 protected: 192 protected:
193 ScopedVector<SupervisedUserSiteList> GetActiveSiteLists( 193 ScopedVector<SupervisedUserSiteList> GetActiveSiteLists(
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 site_lists[0]->GetSites(&sites); 417 site_lists[0]->GetSites(&sites);
418 ASSERT_EQ(1u, sites.size()); 418 ASSERT_EQ(1u, sites.size());
419 EXPECT_EQ(base::ASCIIToUTF16("Moose"), sites[0].name); 419 EXPECT_EQ(base::ASCIIToUTF16("Moose"), sites[0].name);
420 420
421 EXPECT_EQ(SupervisedUserURLFilter::WARN, 421 EXPECT_EQ(SupervisedUserURLFilter::WARN,
422 url_filter->GetFilteringBehaviorForURL(example_url)); 422 url_filter->GetFilteringBehaviorForURL(example_url));
423 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, 423 EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
424 url_filter->GetFilteringBehaviorForURL(moose_url)); 424 url_filter->GetFilteringBehaviorForURL(moose_url));
425 } 425 }
426 #endif // !defined(OS_ANDROID) 426 #endif // !defined(OS_ANDROID)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698