Fix app_shell shutdown crash due to BrowserContextKeyedServices

chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
@@ skipping 279 matching lines @@
  public:
   DriveFileSystemExtensionApiTest() : fake_drive_service_(NULL) {}
   virtual ~DriveFileSystemExtensionApiTest() {}
 
   // FileSystemExtensionApiTestBase OVERRIDE.
   virtual void InitTestFileSystem() OVERRIDE {
     // Set up cache root to be used by DriveIntegrationService. This has to be
     // done before the browser is created because the service instance is
     // initialized by EventRouter.
     ASSERT_TRUE(test_cache_root_.CreateUniqueTempDir());
 

[tbarzic, 2014/01/09 01:58:25]

you could also (optionally) do something like:

this->drive_integration_factory_callback_ = 
base::Bind(&DriveFileSystemExtensionApiTest::CreateDriveIntegrationService,
           this);

DriveIntegrationServiceFactory::SetFactoryForTest(&drive_integration_factory_callback_);

That way you'd avoid the static cast bellow.

[James Cook, 2014/01/09 17:32:19]

Nice idea. Done.

     drive::DriveIntegrationServiceFactory::SetFactoryForTest(
-        base::Bind(
-            &DriveFileSystemExtensionApiTest::CreateDriveIntegrationService,
-            base::Unretained(this)));
+        &DriveFileSystemExtensionApiTest::OnCreateDriveIntegrationService,
+        this);
   }
 
   // FileSystemExtensionApiTestBase OVERRIDE.
   virtual void AddTestMountPoint() OVERRIDE {
     test_util::WaitUntilDriveMountPointIsAdded(browser()->profile());
   }
 
  protected:
+  static drive::DriveIntegrationService* OnCreateDriveIntegrationService(
+      Profile* profile, void* data) {
+    DriveFileSystemExtensionApiTest* self =
+        static_cast<DriveFileSystemExtensionApiTest*>(data);
+    return self->CreateDriveIntegrationService(profile);
+  }
+
   // DriveIntegrationService factory function for this test.
   drive::DriveIntegrationService* CreateDriveIntegrationService(
       Profile* profile) {
     fake_drive_service_ = new drive::FakeDriveService;
     fake_drive_service_->LoadResourceListForWapi(kTestRootFeed);
     fake_drive_service_->LoadAccountMetadataForWapi(
         "gdata/account_metadata.json");
     fake_drive_service_->LoadAppListForDriveApi("drive/applist.json");
 
     return new drive::DriveIntegrationService(
@@ skipping 104 matching lines @@
   fake_drive_service_->set_default_max_results(1);
   EXPECT_TRUE(RunFileSystemExtensionApiTest(
       "file_browser/handler_test_runner",
       FILE_PATH_LITERAL("manifest.json"),
       "file_browser/app_file_handler",
       FLAGS_USE_FILE_HANDLER)) << message_;
 }
 
 }  // namespace
 }  // namespace file_manager