Fix and enable MTPDeviceDelegateImplWinTest.GalleryNameMTP.

chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc

Index: chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
index 92f061f1f44abbd8906f376d06c31d918116d39e..f9844e25cc3e7cafbb4b586c540f9d7b8b5f2ea3 100644
--- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
+++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
@@ -111,11 +111,13 @@ void MTPDeviceDelegateImplWinTest::SetUp() {
 }
 
 void MTPDeviceDelegateImplWinTest::TearDown() {
-  // Windows storage monitor must be destroyed on the same thread
-  // as construction.
-  TestStorageMonitor::Destroy();
-
   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();
 }
 
 void MTPDeviceDelegateImplWinTest::ProcessAttach(
@@ -156,8 +158,7 @@ void MTPDeviceDelegateImplWinTest::CheckGalleryInfo(
     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));