Fix and enable MTPDeviceDelegateImplWinTest.GalleryNameMTP.

chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc

 // Copyright 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.
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 93 matching lines @@
   extension_system->CreateExtensionService(
       base::CommandLine::ForCurrentProcess(), base::FilePath(), false);
 
   std::vector<std::string> all_permissions;
   all_permissions.push_back("allAutoDetected");
   all_permissions.push_back("read");
   extension_ = AddMediaGalleriesApp("all", all_permissions, profile());
 }
 
 void MTPDeviceDelegateImplWinTest::TearDown() {
-  // Windows storage monitor must be destroyed on the same thread
-  // as construction.
+  ChromeRenderViewHostTestHarness::TearDown();
+
+  TestingBrowserProcess::DeleteInstance();
+
+  // Windows storage monitor must be destroyed after the MediaFileSystemRegistry
+  // owned by TestingBrowserProcess because it uses it in its destructor.
   TestStorageMonitor::Destroy();
-
-  ChromeRenderViewHostTestHarness::TearDown();
 }
 
 void MTPDeviceDelegateImplWinTest::ProcessAttach(
     const std::string& id,
     const base::string16& label,
     const base::FilePath::StringType& location) {
   StorageInfo info(id, location, label, base::string16(), base::string16(), 0);
   monitor_->receiver()->ProcessAttach(info);
 }
 
@@ skipping 20 matching lines @@
   EXPECT_EQ(removable, info.removable);
   EXPECT_EQ(media_device, info.media_device);
   EXPECT_NE(0UL, info.pref_id);
 
   if (removable)
     EXPECT_NE(0UL, info.transient_device_id.size());
   else
     EXPECT_EQ(0UL, info.transient_device_id.size());
 }
 
-// Crashes on chromium.win/Win7 bot. http://crbug.com/686803
-TEST_F(MTPDeviceDelegateImplWinTest, DISABLED_GalleryNameMTP) {
+TEST_F(MTPDeviceDelegateImplWinTest, GalleryNameMTP) {
   base::FilePath location(
       PortableDeviceWatcherWin::GetStoragePathFromStorageId(
           TestPortableDeviceWatcherWin::kStorageUniqueIdA));
   AttachDevice(StorageInfo::MTP_OR_PTP, "mtp_fake_id", location);
 
   FSInfoMap results;
   MediaFileSystemRegistry* registry =
       g_browser_process->media_file_system_registry();
   registry->GetMediaFileSystemsForExtension(
       web_contents(), extension_.get(),
       base::Bind(&GetGalleryInfoCallback, base::Unretained(&results)));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(media_directories_.num_galleries() + 1u, results.size());
   bool checked = false;
   for (FSInfoMap::iterator i = results.begin(); i != results.end(); ++i) {
     MediaFileSystemInfo info = i->second;
     if (info.path == location) {
       CheckGalleryInfo(info, location.LossyDisplayName(), location, true, true);
       checked = true;
       break;
     }
   }
   EXPECT_TRUE(checked);
 }