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

Side by Side Diff: chrome/browser/sync/startup_controller_unittest.cc

Issue 666733003: Standardize usage of virtual/override/final in chrome/browser/sync/ (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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/sync/startup_controller.h" 5 #include "chrome/browser/sync/startup_controller.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 18 matching lines...) Expand all
29 // outputting the correct values for the debug string. 29 // outputting the correct values for the debug string.
30 static const char kStateStringStarted[] = "Started"; 30 static const char kStateStringStarted[] = "Started";
31 static const char kStateStringDeferred[] = "Deferred"; 31 static const char kStateStringDeferred[] = "Deferred";
32 static const char kStateStringNotStarted[] = "Not started"; 32 static const char kStateStringNotStarted[] = "Not started";
33 33
34 class FakeSupervisedUserSigninManagerWrapper 34 class FakeSupervisedUserSigninManagerWrapper
35 : public SupervisedUserSigninManagerWrapper { 35 : public SupervisedUserSigninManagerWrapper {
36 public: 36 public:
37 FakeSupervisedUserSigninManagerWrapper() 37 FakeSupervisedUserSigninManagerWrapper()
38 : SupervisedUserSigninManagerWrapper(NULL, NULL) {} 38 : SupervisedUserSigninManagerWrapper(NULL, NULL) {}
39 virtual std::string GetEffectiveUsername() const override { 39 std::string GetEffectiveUsername() const override { return account_; }
40 return account_;
41 }
42 40
43 virtual std::string GetAccountIdToUse() const override { 41 std::string GetAccountIdToUse() const override { return account_; }
44 return account_;
45 }
46 42
47 void set_account(const std::string& account) { account_ = account; } 43 void set_account(const std::string& account) { account_ = account; }
48 44
49 private: 45 private:
50 std::string account_; 46 std::string account_;
51 }; 47 };
52 48
53 class StartupControllerTest : public testing::Test { 49 class StartupControllerTest : public testing::Test {
54 public: 50 public:
55 StartupControllerTest() : started_(false) {} 51 StartupControllerTest() : started_(false) {}
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 controller()->set_setup_in_progress(true); 250 controller()->set_setup_in_progress(true);
255 251
256 // This could happen if the UI triggers a stop-syncing permanently call. 252 // This could happen if the UI triggers a stop-syncing permanently call.
257 controller()->Reset(syncer::UserTypes()); 253 controller()->Reset(syncer::UserTypes());
258 254
259 // From the UI's point of view, setup is still in progress. 255 // From the UI's point of view, setup is still in progress.
260 EXPECT_TRUE(controller()->setup_in_progress()); 256 EXPECT_TRUE(controller()->setup_in_progress());
261 } 257 }
262 258
263 } // namespace browser_sync 259 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc ('k') | chrome/browser/sync/sync_error_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698