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

Side by Side Diff: chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 5 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 | Annotate | Revision Log
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 "apps/app_window_registry.h" 5 #include "apps/app_window_registry.h"
6 #include "base/basictypes.h" 6 #include "base/basictypes.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 17 matching lines...) Expand all
28 28
29 namespace { 29 namespace {
30 30
31 base::FilePath GetTestDemoAppPath() { 31 base::FilePath GetTestDemoAppPath() {
32 base::FilePath test_data_dir; 32 base::FilePath test_data_dir;
33 EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir)); 33 EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
34 return test_data_dir.Append(FILE_PATH_LITERAL("chromeos/demo_app")); 34 return test_data_dir.Append(FILE_PATH_LITERAL("chromeos/demo_app"));
35 } 35 }
36 36
37 Profile* WaitForProfile() { 37 Profile* WaitForProfile() {
38 chromeos::UserManager* user_manager = chromeos::UserManager::Get(); 38 chromeos::UserManager* user_manager = chromeos::GetUserManager();
39 if (!user_manager || !user_manager->IsUserLoggedIn()) { 39 if (!user_manager || !user_manager->IsUserLoggedIn()) {
40 content::WindowedNotificationObserver( 40 content::WindowedNotificationObserver(
41 chrome::NOTIFICATION_SESSION_STARTED, 41 chrome::NOTIFICATION_SESSION_STARTED,
42 content::NotificationService::AllSources()).Wait(); 42 content::NotificationService::AllSources()).Wait();
43 } 43 }
44 44
45 return ProfileManager::GetActiveUserProfile(); 45 return ProfileManager::GetActiveUserProfile();
46 } 46 }
47 47
48 bool VerifyDemoAppLaunch() { 48 bool VerifyDemoAppLaunch() {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 // did launch. 92 // did launch.
93 EXPECT_TRUE(VerifyDemoAppLaunch()); 93 EXPECT_TRUE(VerifyDemoAppLaunch());
94 } 94 }
95 95
96 IN_PROC_BROWSER_TEST_F(DemoAppLauncherTest, NoNetwork) { 96 IN_PROC_BROWSER_TEST_F(DemoAppLauncherTest, NoNetwork) {
97 EXPECT_TRUE(VerifyDemoAppLaunch()); 97 EXPECT_TRUE(VerifyDemoAppLaunch());
98 EXPECT_TRUE(VerifyNetworksDisabled()); 98 EXPECT_TRUE(VerifyNetworksDisabled());
99 } 99 }
100 100
101 } // namespace chromeos 101 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698