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

Side by Side Diff: chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/profile_resetter/automatic_profile_resetter_delegate.h" 5 #include "chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 // Test fixture -------------------------------------------------------------- 160 // Test fixture --------------------------------------------------------------
161 161
162 // ExtensionServiceTestBase sets up a TestingProfile with the ExtensionService, 162 // ExtensionServiceTestBase sets up a TestingProfile with the ExtensionService,
163 // we then add the TemplateURLService, so the ProfileResetter can be exercised. 163 // we then add the TemplateURLService, so the ProfileResetter can be exercised.
164 class AutomaticProfileResetterDelegateTest 164 class AutomaticProfileResetterDelegateTest
165 : public extensions::ExtensionServiceTestBase { 165 : public extensions::ExtensionServiceTestBase {
166 protected: 166 protected:
167 AutomaticProfileResetterDelegateTest() {} 167 AutomaticProfileResetterDelegateTest() {}
168 virtual ~AutomaticProfileResetterDelegateTest() {} 168 virtual ~AutomaticProfileResetterDelegateTest() {}
169 169
170 virtual void SetUp() OVERRIDE { 170 virtual void SetUp() override {
171 extensions::ExtensionServiceTestBase::SetUp(); 171 extensions::ExtensionServiceTestBase::SetUp();
172 ExtensionServiceInitParams params = CreateDefaultInitParams(); 172 ExtensionServiceInitParams params = CreateDefaultInitParams();
173 params.pref_file.clear(); // Prescribes a TestingPrefService to be created. 173 params.pref_file.clear(); // Prescribes a TestingPrefService to be created.
174 InitializeExtensionService(params); 174 InitializeExtensionService(params);
175 template_url_service_test_util_.reset( 175 template_url_service_test_util_.reset(
176 new TemplateURLServiceFactoryTestUtil(profile_.get())); 176 new TemplateURLServiceFactoryTestUtil(profile_.get()));
177 resetter_delegate_.reset( 177 resetter_delegate_.reset(
178 new AutomaticProfileResetterDelegateUnderTest(profile())); 178 new AutomaticProfileResetterDelegateUnderTest(profile()));
179 } 179 }
180 180
181 virtual void TearDown() OVERRIDE { 181 virtual void TearDown() override {
182 resetter_delegate_.reset(); 182 resetter_delegate_.reset();
183 template_url_service_test_util_.reset(); 183 template_url_service_test_util_.reset();
184 extensions::ExtensionServiceTestBase::TearDown(); 184 extensions::ExtensionServiceTestBase::TearDown();
185 } 185 }
186 186
187 scoped_ptr<TemplateURL> CreateTestTemplateURL() { 187 scoped_ptr<TemplateURL> CreateTestTemplateURL() {
188 TemplateURLData data; 188 TemplateURLData data;
189 189
190 data.SetURL("http://example.com/search?q={searchTerms}"); 190 data.SetURL("http://example.com/search?q={searchTerms}");
191 data.suggestions_url = "http://example.com/suggest?q={searchTerms}"; 191 data.suggestions_url = "http://example.com/suggest?q={searchTerms}";
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 if (ProfileResetGlobalError::IsSupportedOnPlatform()) 599 if (ProfileResetGlobalError::IsSupportedOnPlatform())
600 ExpectResetPromptState(true /*active*/); 600 ExpectResetPromptState(true /*active*/);
601 else 601 else
602 ExpectResetPromptState(false /*active*/); 602 ExpectResetPromptState(false /*active*/);
603 resetter_delegate()->DismissPrompt(); 603 resetter_delegate()->DismissPrompt();
604 ExpectResetPromptState(false /*active*/); 604 ExpectResetPromptState(false /*active*/);
605 resetter_delegate()->DismissPrompt(); 605 resetter_delegate()->DismissPrompt();
606 } 606 }
607 607
608 } // namespace 608 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698