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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc

Issue 629463003: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[w-z]* (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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/compiler_specific.h" 6 #include "base/compiler_specific.h"
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/chromeos/login/login_manager_test.h" 8 #include "chrome/browser/chromeos/login/login_manager_test.h"
9 #include "chrome/browser/chromeos/login/startup_utils.h" 9 #include "chrome/browser/chromeos/login/startup_utils.h"
10 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" 10 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
(...skipping 23 matching lines...) Expand all
34 public: 34 public:
35 AccountsOptionsTest() 35 AccountsOptionsTest()
36 : LoginManagerTest(false), 36 : LoginManagerTest(false),
37 device_settings_provider_(NULL) { 37 device_settings_provider_(NULL) {
38 stub_settings_provider_.Set(kDeviceOwner, base::StringValue(kTestUsers[0])); 38 stub_settings_provider_.Set(kDeviceOwner, base::StringValue(kTestUsers[0]));
39 } 39 }
40 40
41 virtual ~AccountsOptionsTest() { 41 virtual ~AccountsOptionsTest() {
42 } 42 }
43 43
44 virtual void SetUpOnMainThread() OVERRIDE { 44 virtual void SetUpOnMainThread() override {
45 LoginManagerTest::SetUpOnMainThread(); 45 LoginManagerTest::SetUpOnMainThread();
46 CrosSettings* settings = CrosSettings::Get(); 46 CrosSettings* settings = CrosSettings::Get();
47 device_settings_provider_ = settings->GetProvider(kDeviceOwner); 47 device_settings_provider_ = settings->GetProvider(kDeviceOwner);
48 settings->RemoveSettingsProvider(device_settings_provider_); 48 settings->RemoveSettingsProvider(device_settings_provider_);
49 settings->AddSettingsProvider(&stub_settings_provider_); 49 settings->AddSettingsProvider(&stub_settings_provider_);
50 } 50 }
51 51
52 virtual void TearDownOnMainThread() OVERRIDE { 52 virtual void TearDownOnMainThread() override {
53 CrosSettings* settings = CrosSettings::Get(); 53 CrosSettings* settings = CrosSettings::Get();
54 settings->RemoveSettingsProvider(&stub_settings_provider_); 54 settings->RemoveSettingsProvider(&stub_settings_provider_);
55 settings->AddSettingsProvider(device_settings_provider_); 55 settings->AddSettingsProvider(device_settings_provider_);
56 LoginManagerTest::TearDownOnMainThread(); 56 LoginManagerTest::TearDownOnMainThread();
57 } 57 }
58 58
59 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 59 virtual void SetUpCommandLine(CommandLine* command_line) override {
60 LoginManagerTest::SetUpCommandLine(command_line); 60 LoginManagerTest::SetUpCommandLine(command_line);
61 } 61 }
62 62
63 protected: 63 protected:
64 void CheckAccountsUI(const user_manager::User* user, bool is_owner) { 64 void CheckAccountsUI(const user_manager::User* user, bool is_owner) {
65 Profile* profile = ProfileHelper::Get()->GetProfileByUserUnsafe(user); 65 Profile* profile = ProfileHelper::Get()->GetProfileByUserUnsafe(user);
66 profile->GetPrefs()->SetString(prefs::kGoogleServicesUsername, 66 profile->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
67 user->email()); 67 user->email());
68 68
69 ui_test_utils::BrowserAddedObserver observer; 69 ui_test_utils::BrowserAddedObserver observer;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 AddUser(kTestUsers[1]); 137 AddUser(kTestUsers[1]);
138 138
139 user_manager::UserManager* manager = user_manager::UserManager::Get(); 139 user_manager::UserManager* manager = user_manager::UserManager::Get();
140 ASSERT_EQ(2u, manager->GetLoggedInUsers().size()); 140 ASSERT_EQ(2u, manager->GetLoggedInUsers().size());
141 141
142 CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */); 142 CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */);
143 CheckAccountsUI(manager->FindUser(kTestUsers[1]), false /* is_owner */); 143 CheckAccountsUI(manager->FindUser(kTestUsers[1]), false /* is_owner */);
144 } 144 }
145 145
146 } // namespace chromeos 146 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698