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

Side by Side Diff: chrome/browser/policy/cloud/device_management_service_browsertest.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 (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/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 g_browser_process->system_request_context())); 134 g_browser_process->system_request_context()));
135 job->SetGaiaToken("gaia_auth_token"); 135 job->SetGaiaToken("gaia_auth_token");
136 job->SetOAuthToken("oauth_token"); 136 job->SetOAuthToken("oauth_token");
137 job->SetClientID("testid"); 137 job->SetClientID("testid");
138 job->GetRequest()->mutable_register_request(); 138 job->GetRequest()->mutable_register_request();
139 job->Start(base::Bind(&DeviceManagementServiceIntegrationTest::OnJobDone, 139 job->Start(base::Bind(&DeviceManagementServiceIntegrationTest::OnJobDone,
140 base::Unretained(this))); 140 base::Unretained(this)));
141 base::MessageLoop::current()->Run(); 141 base::MessageLoop::current()->Run();
142 } 142 }
143 143
144 virtual void SetUpOnMainThread() OVERRIDE { 144 virtual void SetUpOnMainThread() override {
145 std::string service_url((this->*(GetParam()))()); 145 std::string service_url((this->*(GetParam()))());
146 service_.reset(new DeviceManagementService( 146 service_.reset(new DeviceManagementService(
147 scoped_ptr<DeviceManagementService::Configuration>( 147 scoped_ptr<DeviceManagementService::Configuration>(
148 new MockDeviceManagementServiceConfiguration(service_url)))); 148 new MockDeviceManagementServiceConfiguration(service_url))));
149 service_->ScheduleInitialization(0); 149 service_->ScheduleInitialization(0);
150 } 150 }
151 151
152 virtual void TearDownOnMainThread() OVERRIDE { 152 virtual void TearDownOnMainThread() override {
153 service_.reset(); 153 service_.reset();
154 test_server_.reset(); 154 test_server_.reset();
155 interceptor_.reset(); 155 interceptor_.reset();
156 } 156 }
157 157
158 void StartTestServer() { 158 void StartTestServer() {
159 test_server_.reset( 159 test_server_.reset(
160 new LocalPolicyTestServer("device_management_service_browsertest")); 160 new LocalPolicyTestServer("device_management_service_browsertest"));
161 ASSERT_TRUE(test_server_->Start()); 161 ASSERT_TRUE(test_server_->Start());
162 } 162 }
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 base::MessageLoop::current()->Run(); 260 base::MessageLoop::current()->Run();
261 } 261 }
262 262
263 INSTANTIATE_TEST_CASE_P( 263 INSTANTIATE_TEST_CASE_P(
264 DeviceManagementServiceIntegrationTestInstance, 264 DeviceManagementServiceIntegrationTestInstance,
265 DeviceManagementServiceIntegrationTest, 265 DeviceManagementServiceIntegrationTest,
266 testing::Values(&DeviceManagementServiceIntegrationTest::InitCannedResponse, 266 testing::Values(&DeviceManagementServiceIntegrationTest::InitCannedResponse,
267 &DeviceManagementServiceIntegrationTest::InitTestServer)); 267 &DeviceManagementServiceIntegrationTest::InitTestServer));
268 268
269 } // namespace policy 269 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698