chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc - Issue 933503004: Always load signin profile on Chrome OS startup.

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/file_manager/external_filesystem_apitest.cc

Issue 933503004: Always load signin profile on Chrome OS startup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rollback unnecessary changes. Created 5 years, 10 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

« chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('K') | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/chromeos/profiles/profile_helper.cc » ('j') | chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

diff --git a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

index 600cd583c8230abc5c2e24a358f2273152c5ac30..b76ac84083cc1804fc7053d5961f3c38bd647ac9 100644

--- a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

+++ b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

@@ -529,6 +529,13 @@ class DriveFileSystemExtensionApiTest : public FileSystemExtensionApiTestBase {

// DriveIntegrationService factory function for this test.

drive::DriveIntegrationService* CreateDriveIntegrationService(

Profile* profile) {

+ // Ignore signin profile.

+ if (profile->GetPath() == chromeos::ProfileHelper::GetSigninProfileDir())

+ return NULL;

+ // DriveFileSystemExtensionApiTest doesn't expect that several user profiles

+ // could exist simultaneously.

+ CHECK(fake_drive_service_ == NULL);

fake_drive_service_ = new drive::FakeDriveService;

fake_drive_service_->LoadAppListForDriveApi("drive/applist.json");