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 24 matching lines @@
 #include "chromeos/chromeos_switches.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/common/extension.h"
 #include "google_apis/drive/gdata_wapi_parser.h"
 #include "google_apis/drive/test_util.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 
+using drive::DriveIntegrationServiceFactory;
+
 namespace file_manager {
 namespace {
 
 enum EntryType {
   FILE,
   DIRECTORY,
 };
 
 enum TargetVolume {
   LOCAL_VOLUME,
@@ skipping 208 matching lines @@
 // The drive volume class for test.
 // This class provides the operations for a test volume that simulates Google
 // drive.
 class DriveTestVolume {
  public:
   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.
+  // This method must be called at SetUp method of FileManagerBrowserTestBase.
   // Returns true on success.
   bool SetUp() {
     if (!test_cache_root_.CreateUniqueTempDir())
       return false;
-    drive::DriveIntegrationServiceFactory::SetFactoryForTest(
+    create_drive_integration_service_ =
         base::Bind(&DriveTestVolume::CreateDriveIntegrationService,
-                   base::Unretained(this)));
+                   base::Unretained(this));
+    service_factory_for_test_.reset(
+        new DriveIntegrationServiceFactory::ScopedFactoryForTest(
+            &create_drive_integration_service_));
     return true;
   }
 
   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;
@@ skipping 116 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_;
+  DriveIntegrationServiceFactory::FactoryCallback
+      create_drive_integration_service_;
+  scoped_ptr<DriveIntegrationServiceFactory::ScopedFactoryForTest>
+      service_factory_for_test_;
 };
 
 // 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 314 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