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

Side by Side Diff: chrome/browser/extensions/external_provider_impl_unittest.cc

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (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 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/extensions/external_provider_impl.h" 5 #include "chrome/browser/extensions/external_provider_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 service_, profile_.get(), &providers); 72 service_, profile_.get(), &providers);
73 73
74 for (ProviderCollection::iterator i = providers.begin(); 74 for (ProviderCollection::iterator i = providers.begin();
75 i != providers.end(); 75 i != providers.end();
76 ++i) { 76 ++i) {
77 service_->AddProviderForTesting(i->release()); 77 service_->AddProviderForTesting(i->release());
78 } 78 }
79 } 79 }
80 80
81 // ExtensionServiceTestBase overrides: 81 // ExtensionServiceTestBase overrides:
82 virtual void SetUp() OVERRIDE { 82 virtual void SetUp() override {
83 ExtensionServiceTestBase::SetUp(); 83 ExtensionServiceTestBase::SetUp();
84 test_server_.reset(new EmbeddedTestServer()); 84 test_server_.reset(new EmbeddedTestServer());
85 85
86 #if defined(OS_CHROMEOS) 86 #if defined(OS_CHROMEOS)
87 TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_); 87 TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_);
88 chromeos::ServicesCustomizationDocument::RegisterPrefs( 88 chromeos::ServicesCustomizationDocument::RegisterPrefs(
89 local_state_.registry()); 89 local_state_.registry());
90 #endif 90 #endif
91 91
92 ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady()); 92 ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady());
93 test_server_->RegisterRequestHandler( 93 test_server_->RegisterRequestHandler(
94 base::Bind(&ExternalProviderImplTest::HandleRequest, 94 base::Bind(&ExternalProviderImplTest::HandleRequest,
95 base::Unretained(this))); 95 base::Unretained(this)));
96 96
97 test_extension_cache_.reset(new ExtensionCacheFake()); 97 test_extension_cache_.reset(new ExtensionCacheFake());
98 98
99 CommandLine* cmdline = CommandLine::ForCurrentProcess(); 99 CommandLine* cmdline = CommandLine::ForCurrentProcess();
100 cmdline->AppendSwitchASCII(switches::kAppsGalleryUpdateURL, 100 cmdline->AppendSwitchASCII(switches::kAppsGalleryUpdateURL,
101 test_server_->GetURL(kManifestPath).spec()); 101 test_server_->GetURL(kManifestPath).spec());
102 #if defined(OS_CHROMEOS) 102 #if defined(OS_CHROMEOS)
103 chromeos::system::StatisticsProvider::SetTestProvider( 103 chromeos::system::StatisticsProvider::SetTestProvider(
104 &mock_statistics_provider_); 104 &mock_statistics_provider_);
105 EXPECT_CALL(mock_statistics_provider_, GetMachineStatistic(_, NotNull())) 105 EXPECT_CALL(mock_statistics_provider_, GetMachineStatistic(_, NotNull()))
106 .WillRepeatedly(Return(false)); 106 .WillRepeatedly(Return(false));
107 #endif 107 #endif
108 } 108 }
109 109
110 virtual void TearDown() OVERRIDE { 110 virtual void TearDown() override {
111 #if defined(OS_CHROMEOS) 111 #if defined(OS_CHROMEOS)
112 chromeos::system::StatisticsProvider::SetTestProvider(NULL); 112 chromeos::system::StatisticsProvider::SetTestProvider(NULL);
113 TestingBrowserProcess::GetGlobal()->SetLocalState(NULL); 113 TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
114 #endif 114 #endif
115 } 115 }
116 116
117 private: 117 private:
118 scoped_ptr<HttpResponse> HandleRequest(const HttpRequest& request) { 118 scoped_ptr<HttpResponse> HandleRequest(const HttpRequest& request) {
119 GURL url = test_server_->GetURL(request.relative_url); 119 GURL url = test_server_->GetURL(request.relative_url);
120 if (url.path() == kManifestPath) { 120 if (url.path() == kManifestPath) {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 service_->CheckForExternalUpdates(); 172 service_->CheckForExternalUpdates();
173 runner->Run(); 173 runner->Run();
174 174
175 EXPECT_TRUE(service_->GetInstalledExtension( 175 EXPECT_TRUE(service_->GetInstalledExtension(
176 extension_misc::kInAppPaymentsSupportAppId)); 176 extension_misc::kInAppPaymentsSupportAppId));
177 EXPECT_TRUE(service_->IsExtensionEnabled( 177 EXPECT_TRUE(service_->IsExtensionEnabled(
178 extension_misc::kInAppPaymentsSupportAppId)); 178 extension_misc::kInAppPaymentsSupportAppId));
179 } 179 }
180 180
181 } // namespace extensions 181 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698