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

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

Issue 816403003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 12 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(base::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 66
67 ui_test_utils::BrowserAddedObserver observer; 67 ui_test_utils::BrowserAddedObserver observer;
68 Browser* browser = CreateBrowser(profile); 68 Browser* browser = CreateBrowser(profile);
69 observer.WaitForSingleNewBrowser(); 69 observer.WaitForSingleNewBrowser();
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 AddUser(kTestUsers[1]); 135 AddUser(kTestUsers[1]);
136 136
137 user_manager::UserManager* manager = user_manager::UserManager::Get(); 137 user_manager::UserManager* manager = user_manager::UserManager::Get();
138 ASSERT_EQ(2u, manager->GetLoggedInUsers().size()); 138 ASSERT_EQ(2u, manager->GetLoggedInUsers().size());
139 139
140 CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */); 140 CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */);
141 CheckAccountsUI(manager->FindUser(kTestUsers[1]), false /* is_owner */); 141 CheckAccountsUI(manager->FindUser(kTestUsers[1]), false /* is_owner */);
142 } 142 }
143 143
144 } // namespace chromeos 144 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698