chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc - Issue 378513005: [Athena] Extract Chrome OS authentication stack

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/extensions/extension_garbage_collector_chromeos_unittest.cc

Issue 378513005: [Athena] Extract Chrome OS authentication stack (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix includes in one more 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/networking_private/networking_private_apitest.cc ('k') | chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc

diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc

index d8a8a78a3dce6342dd1c4ae875feabc251a215c8..fea341ebb0ac66800db9a585913ef31c6037cabd 100644

--- a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc

+++ b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc

@@ -19,6 +19,7 @@

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

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

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

+#include "chromeos/login/user_names.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/plugin_service.h"

#include "extensions/browser/extension_prefs.h"

@@ -63,8 +64,8 @@ class ExtensionGarbageCollectorChromeOSUnitTest

user_manager_enabler_.reset(

new chromeos::ScopedUserManagerEnabler(new chromeos::FakeUserManager));

- GetFakeUserManager()->AddUser(chromeos::UserManager::kStubUser);

- GetFakeUserManager()->LoginUser(chromeos::UserManager::kStubUser);

+ GetFakeUserManager()->AddUser(chromeos::login::kStubUser);

+ GetFakeUserManager()->LoginUser(chromeos::login::kStubUser);

chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(

GetFakeUserManager()->GetActiveUser(), profile_.get());

}

@@ -160,14 +161,14 @@ TEST_F(ExtensionGarbageCollectorChromeOSUnitTest, SharedExtensions) {

base::FilePath path_id1_2 = CreateSharedExtensionDir(

kExtensionId1, "2.0", cache_dir());

CreateSharedExtensionPrefs(

- kExtensionId1, "2.0", chromeos::UserManager::kStubUser, path_id1_2);

+ kExtensionId1, "2.0", chromeos::login::kStubUser, path_id1_2);

EXPECT_TRUE(base::PathExists(path_id1_2));

// Version for current user that delayed install.

base::FilePath path_id2_1 = CreateSharedExtensionDir(

kExtensionId2, "1.0", cache_dir());

CreateSharedExtensionPrefs(

- kExtensionId2, "1.0", chromeos::UserManager::kStubUser, path_id2_1);

+ kExtensionId2, "1.0", chromeos::login::kStubUser, path_id2_1);

scoped_refptr<Extension> extension2 = CreateExtension(kExtensionId2, "1.0",

path_id2_1);

GetExtensionPrefs()->SetDelayedInstallInfo(