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

Unified Diff: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

Issue 118043003: Fix app_shell shutdown crash due to BrowserContextKeyedServices (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix FileSystem tests (shutdown_crash) Created 6 years, 11 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/chromeos/file_manager/file_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
index b955a7f2fe07093284d36298e0cdb6e1f51250dd..d404ae51b106e7df047daf3df65166dd1bd2d5aa 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -276,11 +276,17 @@ class DriveTestVolume {
if (!test_cache_root_.CreateUniqueTempDir())
return false;
drive::DriveIntegrationServiceFactory::SetFactoryForTest(
- base::Bind(&DriveTestVolume::CreateDriveIntegrationService,
- base::Unretained(this)));
+ &DriveTestVolume::OnCreateDriveIntegrationService,
+ this);
return true;
}
+ static drive::DriveIntegrationService* OnCreateDriveIntegrationService(
+ Profile* profile, void* data) {
+ DriveTestVolume* self = static_cast<DriveTestVolume*>(data);
+ return self->CreateDriveIntegrationService(profile);
+ }
+
void CreateEntry(const TestEntryInfo& entry) {
const base::FilePath path =
base::FilePath::FromUTF8Unsafe(entry.target_path);

Powered by Google App Engine
This is Rietveld 408576698