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

Unified Diff: chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc

Issue 240333011: Always load signin profile on Chrome OS startup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Next iteration. Created 6 years, 7 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
Index: chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
index b6e67fa31a8c7733d284268f7807f4356891243e..7ae0d439c8de1debeb7a1a841f601a8da7a58813 100644
--- a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
@@ -7,11 +7,13 @@
#include "chrome/browser/chromeos/drive/file_system_interface.h"
#include "chrome/browser/chromeos/drive/file_system_util.h"
#include "chrome/browser/chromeos/drive/test_util.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/drive/fake_drive_service.h"
#include "chrome/browser/extensions/api/file_system/file_system_api.h"
#include "content/public/test/test_utils.h"
#include "google_apis/drive/test_util.h"
+
namespace extensions {
// This class contains chrome.filesystem API test specific to Chrome OS, namely,
@@ -60,6 +62,13 @@ class FileSystemApiTestForDrive : public PlatformAppBrowserTest {
private:
drive::DriveIntegrationService* CreateDriveIntegrationService(
Profile* profile) {
+ // Ignore signin profile.
+ if (profile->GetPath() == chromeos::ProfileHelper::GetSigninProfileDir())
+ return NULL;
+
+ // FileSystemApiTestForDrive 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");
« no previous file with comments | « chrome/browser/chromeos/profiles/profile_helper.cc ('k') | chrome/browser/extensions/extension_browsertest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698