chrome/browser/chromeos/drive/drive_notification_manager_factory_browsertest.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/drive/drive_notification_manager_factory_browsertest.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity Created 6 years, 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/display/display_preferences_unittest.cc ('k') | chrome/browser/chromeos/drive/file_system_util.cc » ('j') | chrome/browser/chromeos/first_run/first_run.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/drive/drive_notification_manager_factory_browsertest.cc

diff --git a/chrome/browser/chromeos/drive/drive_notification_manager_factory_browsertest.cc b/chrome/browser/chromeos/drive/drive_notification_manager_factory_browsertest.cc

index 2176ec3b0983ab633d82ee332f940a7eff17c040..315afd3226cd424541f6905a0e089ce1af0b5fd8 100644

--- a/chrome/browser/chromeos/drive/drive_notification_manager_factory_browsertest.cc

+++ b/chrome/browser/chromeos/drive/drive_notification_manager_factory_browsertest.cc

@@ -6,13 +6,13 @@

#include "base/command_line.h"

#include "base/compiler_specific.h"

-#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/test/base/in_process_browser_test.h"

#include "chromeos/chromeos_switches.h"

#include "chromeos/login/user_names.h"

+#include "components/user_manager/user_manager.h"

#include "testing/gtest/include/gtest/gtest.h"

namespace drive {

@@ -52,7 +52,7 @@ class DriveNotificationManagerFactoryGuestBrowserTest

// profile or the guest profile while a guest session is in progress.

IN_PROC_BROWSER_TEST_F(DriveNotificationManagerFactoryGuestBrowserTest,

NoDriveNotificationManager) {

- chromeos::UserManager* user_manager = chromeos::UserManager::Get();

+ user_manager::UserManager* user_manager = user_manager::UserManager::Get();

EXPECT_TRUE(user_manager->IsLoggedInAsGuest());

Profile* guest_profile = chromeos::ProfileHelper::Get()

->GetProfileByUser(user_manager->GetActiveUser())