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

Side by Side Diff: chrome/browser/printing/cloud_print/cloud_print_proxy_service_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 (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 <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/prefs/testing_pref_service.h" 10 #include "base/prefs/testing_pref_service.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 void Initialize() { 176 void Initialize() {
177 CloudPrintProxyService::Initialize(); 177 CloudPrintProxyService::Initialize();
178 base::RunLoop().RunUntilIdle(); 178 base::RunLoop().RunUntilIdle();
179 } 179 }
180 180
181 void RefreshStatusFromService() { 181 void RefreshStatusFromService() {
182 CloudPrintProxyService::RefreshStatusFromService(); 182 CloudPrintProxyService::RefreshStatusFromService();
183 base::RunLoop().RunUntilIdle(); 183 base::RunLoop().RunUntilIdle();
184 } 184 }
185 185
186 virtual ServiceProcessControl* GetServiceProcessControl() OVERRIDE { 186 virtual ServiceProcessControl* GetServiceProcessControl() override {
187 return &process_control_; 187 return &process_control_;
188 } 188 }
189 MockServiceProcessControl* GetMockServiceProcessControl() { 189 MockServiceProcessControl* GetMockServiceProcessControl() {
190 return &process_control_; 190 return &process_control_;
191 } 191 }
192 192
193 void EnableForUser() { 193 void EnableForUser() {
194 EnableForUserWithRobot("123", "123@gmail.com", 194 EnableForUserWithRobot("123", "123@gmail.com",
195 MockServiceProcessControl::EnabledUserId(), 195 MockServiceProcessControl::EnabledUserId(),
196 base::DictionaryValue()); 196 base::DictionaryValue());
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 460
461 CloudPrintProxyServiceFactory::GetInstance()-> 461 CloudPrintProxyServiceFactory::GetInstance()->
462 SetTestingFactory(&profile_, TestCloudPrintProxyServiceFactory); 462 SetTestingFactory(&profile_, TestCloudPrintProxyServiceFactory);
463 463
464 CommandLine command_line(CommandLine::NO_PROGRAM); 464 CommandLine command_line(CommandLine::NO_PROGRAM);
465 command_line.AppendSwitch(switches::kCheckCloudPrintConnectorPolicy); 465 command_line.AppendSwitch(switches::kCheckCloudPrintConnectorPolicy);
466 466
467 EXPECT_FALSE(LaunchBrowser(command_line, &profile_)); 467 EXPECT_FALSE(LaunchBrowser(command_line, &profile_));
468 base::RunLoop().RunUntilIdle(); 468 base::RunLoop().RunUntilIdle();
469 } 469 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698