Fix app_shell shutdown crash due to BrowserContextKeyedServices

chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

 // Copyright (c) 2013 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.
 
 // Browser test for basic Chrome OS file manager functionality:
 //  - The file list is updated when a file is added externally to the Downloads
 //    folder.
 //  - Selecting a file and copy-pasting it with the keyboard copies the file.
 //  - Selecting a file and pressing delete deletes it.
 
@@ skipping 257 matching lines @@
   DriveTestVolume() : fake_drive_service_(NULL),
                       integration_service_(NULL) {
   }
 
   // Sends request to add this volume to the file system as Google drive.
   // This method must be calld at SetUp method of FileManagerBrowserTestBase.
   // Returns true on success.
   bool SetUp() {
     if (!test_cache_root_.CreateUniqueTempDir())
       return false;
+    create_drive_integration_service_ =
+        base::Bind(&DriveTestVolume::CreateDriveIntegrationService,
+                   base::Unretained(this));
     drive::DriveIntegrationServiceFactory::SetFactoryForTest(
-        base::Bind(&DriveTestVolume::CreateDriveIntegrationService,
-                   base::Unretained(this)));
+        &create_drive_integration_service_);
     return true;
   }
 
+  void TearDown() {
+    drive::DriveIntegrationServiceFactory::SetFactoryForTest(NULL);
+  }
+
   void CreateEntry(const TestEntryInfo& entry) {
     const base::FilePath path =
         base::FilePath::FromUTF8Unsafe(entry.target_path);
     const std::string target_name = path.BaseName().AsUTF8Unsafe();
 
     // Obtain the parent entry.
     drive::FileError error = drive::FILE_ERROR_OK;
     scoped_ptr<drive::ResourceEntry> parent_entry(new drive::ResourceEntry);
     integration_service_->file_system()->GetResourceEntry(
         drive::util::GetDriveMyDriveRootPath().Append(path).DirName(),
@@ skipping 113 matching lines @@
     fake_drive_service_->LoadAppListForDriveApi("drive/applist.json");
     integration_service_ = new drive::DriveIntegrationService(
         profile, NULL, fake_drive_service_, test_cache_root_.path(), NULL);
     return integration_service_;
   }
 
  private:
   base::ScopedTempDir test_cache_root_;
   drive::FakeDriveService* fake_drive_service_;
   drive::DriveIntegrationService* integration_service_;
+  drive::DriveIntegrationServiceFactory::FactoryCallback
+      create_drive_integration_service_;
 };
 
 // Listener to obtain the test relative messages synchronously.
 class FileManagerTestListener : public content::NotificationObserver {
  public:
   struct Message {
     int type;
     std::string message;
     scoped_refptr<extensions::TestSendMessageFunction> function;
   };
@@ skipping 54 matching lines @@
 
   virtual void SetUp() OVERRIDE {
     // TODO(danakj): The GPU Video Decoder needs real GL bindings.
     // crbug.com/269087
     UseRealGLBindings();
 
     ExtensionApiTest::SetUp();
   }
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
+  virtual void TearDownInProcessBrowserTestFixture() OVERRIDE;
 
   virtual void SetUpOnMainThread() OVERRIDE;
 
   // Adds an incognito and guest-mode flags for tests in the guest mode.
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 
   // Loads our testing extension and sends it a string identifying the current
   // test.
   void StartTest();
 
   const scoped_ptr<LocalTestVolume> local_volume_;
   const scoped_ptr<DriveTestVolume> drive_volume_;
 };
 
 void FileManagerBrowserTest::SetUpInProcessBrowserTestFixture() {
   ExtensionApiTest::SetUpInProcessBrowserTestFixture();
   extensions::ComponentLoader::EnableBackgroundExtensionsForTesting();
   if (drive_volume_)
     ASSERT_TRUE(drive_volume_->SetUp());
 }
 
+void FileManagerBrowserTest::TearDownInProcessBrowserTestFixture() {
+  if (drive_volume_)
+    drive_volume_->TearDown();
+  ExtensionApiTest::TearDownInProcessBrowserTestFixture();
+}
+
 void FileManagerBrowserTest::SetUpOnMainThread() {
   ExtensionApiTest::SetUpOnMainThread();
   ASSERT_TRUE(local_volume_->Mount(browser()->profile()));
 
   if (drive_volume_) {
     // Install the web server to serve the mocked share dialog.
     ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
     const GURL share_url_base(embedded_test_server()->GetURL(
         "/chromeos/file_manager/share_dialog_mock/index.html"));
     drive_volume_->ConfigureShareUrlBase(share_url_base);
@@ skipping 219 matching lines @@
     ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "searchBoxFocus")));
 
 INSTANTIATE_TEST_CASE_P(
     Thumbnails,
     FileManagerBrowserTest,
     ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "thumbnailsDownloads"),
                       TestParameter(IN_GUEST_MODE, "thumbnailsDownloads")));
 
 }  // namespace
 }  // namespace file_manager