Chromium Code Reviews| 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 bd44af2947ad058a64a54635115b5c63c2511e74..e9b9e1fe458b57d6b692c9d56be5d3e50386bf64 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,6 +7,7 @@ |
| #include "chrome/browser/chromeos/drive/drive_integration_service.h" |
| #include "chrome/browser/chromeos/drive/file_system_interface.h" |
| #include "chrome/browser/chromeos/drive/file_system_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 "chrome/browser/extensions/component_loader.h" |
| @@ -64,6 +65,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); |
|
mtomasz
2015/02/26 04:27:50
nit: ditto
Ivan Podogov
2015/02/26 11:02:08
Done.
|
| fake_drive_service_ = new drive::FakeDriveService; |
| fake_drive_service_->LoadAppListForDriveApi("drive/applist.json"); |