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

Side by Side Diff: components/search_engines/template_url_service_unittest.cc

Issue 623133002: replace OVERRIDE and FINAL with override and final in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/bind.h" 5 #include "base/bind.h"
6 #include "base/bind_helpers.h" 6 #include "base/bind_helpers.h"
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 } // namespace 126 } // namespace
127 127
128 128
129 // TemplateURLServiceTest ----------------------------------------------------- 129 // TemplateURLServiceTest -----------------------------------------------------
130 130
131 class TemplateURLServiceTest : public testing::Test { 131 class TemplateURLServiceTest : public testing::Test {
132 public: 132 public:
133 TemplateURLServiceTest(); 133 TemplateURLServiceTest();
134 134
135 // testing::Test: 135 // testing::Test:
136 virtual void SetUp() OVERRIDE; 136 virtual void SetUp() override;
137 virtual void TearDown() OVERRIDE; 137 virtual void TearDown() override;
138 138
139 TemplateURL* AddKeywordWithDate(const std::string& short_name, 139 TemplateURL* AddKeywordWithDate(const std::string& short_name,
140 const std::string& keyword, 140 const std::string& keyword,
141 const std::string& url, 141 const std::string& url,
142 const std::string& suggest_url, 142 const std::string& suggest_url,
143 const std::string& alternate_url, 143 const std::string& alternate_url,
144 const std::string& favicon_url, 144 const std::string& favicon_url,
145 bool safe_for_autoreplace, 145 bool safe_for_autoreplace,
146 const std::string& encodings, 146 const std::string& encodings,
147 Time date_created, 147 Time date_created,
(...skipping 21 matching lines...) Expand all
169 content::TestBrowserThreadBundle thread_bundle_; // To set up BrowserThreads. 169 content::TestBrowserThreadBundle thread_bundle_; // To set up BrowserThreads.
170 scoped_ptr<TemplateURLServiceTestUtil> test_util_; 170 scoped_ptr<TemplateURLServiceTestUtil> test_util_;
171 171
172 DISALLOW_COPY_AND_ASSIGN(TemplateURLServiceTest); 172 DISALLOW_COPY_AND_ASSIGN(TemplateURLServiceTest);
173 }; 173 };
174 174
175 class TemplateURLServiceWithoutFallbackTest : public TemplateURLServiceTest { 175 class TemplateURLServiceWithoutFallbackTest : public TemplateURLServiceTest {
176 public: 176 public:
177 TemplateURLServiceWithoutFallbackTest() : TemplateURLServiceTest() {} 177 TemplateURLServiceWithoutFallbackTest() : TemplateURLServiceTest() {}
178 178
179 virtual void SetUp() OVERRIDE { 179 virtual void SetUp() override {
180 DefaultSearchManager::SetFallbackSearchEnginesDisabledForTesting(true); 180 DefaultSearchManager::SetFallbackSearchEnginesDisabledForTesting(true);
181 TemplateURLServiceTest::SetUp(); 181 TemplateURLServiceTest::SetUp();
182 } 182 }
183 183
184 virtual void TearDown() OVERRIDE { 184 virtual void TearDown() override {
185 TemplateURLServiceTest::TearDown(); 185 TemplateURLServiceTest::TearDown();
186 DefaultSearchManager::SetFallbackSearchEnginesDisabledForTesting(false); 186 DefaultSearchManager::SetFallbackSearchEnginesDisabledForTesting(false);
187 } 187 }
188 }; 188 };
189 189
190 TemplateURLServiceTest::TemplateURLServiceTest() { 190 TemplateURLServiceTest::TemplateURLServiceTest() {
191 } 191 }
192 192
193 void TemplateURLServiceTest::SetUp() { 193 void TemplateURLServiceTest::SetUp() {
194 test_util_.reset(new TemplateURLServiceTestUtil); 194 test_util_.reset(new TemplateURLServiceTestUtil);
(...skipping 1292 matching lines...) Expand 10 before | Expand all | Expand 10 after
1487 scoped_ptr<TemplateURL::AssociatedExtensionInfo> extension_info( 1487 scoped_ptr<TemplateURL::AssociatedExtensionInfo> extension_info(
1488 new TemplateURL::AssociatedExtensionInfo( 1488 new TemplateURL::AssociatedExtensionInfo(
1489 TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, "ext1")); 1489 TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, "ext1"));
1490 extension_info->wants_to_be_default_engine = true; 1490 extension_info->wants_to_be_default_engine = true;
1491 model()->AddExtensionControlledTURL(ext_dse, extension_info.Pass()); 1491 model()->AddExtensionControlledTURL(ext_dse, extension_info.Pass());
1492 EXPECT_EQ(ext_dse, model()->GetTemplateURLForKeyword(ASCIIToUTF16("ext1"))); 1492 EXPECT_EQ(ext_dse, model()->GetTemplateURLForKeyword(ASCIIToUTF16("ext1")));
1493 EXPECT_TRUE(model()->is_default_search_managed()); 1493 EXPECT_TRUE(model()->is_default_search_managed());
1494 actual_managed_default = model()->GetDefaultSearchProvider(); 1494 actual_managed_default = model()->GetDefaultSearchProvider();
1495 ExpectSimilar(expected_managed_default.get(), actual_managed_default); 1495 ExpectSimilar(expected_managed_default.get(), actual_managed_default);
1496 } 1496 }
OLDNEW
« no previous file with comments | « components/search_engines/template_url_service_sync_unittest.cc ('k') | components/search_engines/testing_search_terms_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698