[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/media_storage_util_unittest.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 <string>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/storage_monitor/media_storage_util.h"
 #include "chrome/browser/storage_monitor/removable_device_constants.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "chrome/browser/storage_monitor/test_storage_monitor.h"
+#include "chrome/test/base/testing_browser_process.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chrome {
 
 namespace {
 
 const char kImageCaptureDeviceId[] = "ic:xyz";
 
@@ skipping 14 matching lines @@
     if (expected_val)
       EXPECT_TRUE(MediaStorageUtil::HasDcim(mount_point));
     else
       EXPECT_FALSE(MediaStorageUtil::HasDcim(mount_point));
   }
 
   void ProcessAttach(const std::string& id,
                      const string16& name,
                      const base::FilePath::StringType& location) {
     StorageInfo info(id, name, location, string16(), string16(), string16(), 0);
-    monitor_.receiver()->ProcessAttach(info);
+    monitor_->receiver()->ProcessAttach(info);
   }
 
  protected:
   // Create mount point for the test device.
   base::FilePath CreateMountPoint(bool create_dcim_dir) {
     base::FilePath path(scoped_temp_dir_.path());
     if (create_dcim_dir)
       path = path.Append(kDCIMDirectoryName);
     if (!file_util::CreateDirectory(path))
       return base::FilePath();
     return scoped_temp_dir_.path();
   }
 
   virtual void SetUp() OVERRIDE {
+    monitor_ = chrome::test::TestStorageMonitor::Create();

[vandebo (ex-Chrome), 2013/07/10 16:57:45]

leak?

[Greg Billock, 2013/07/10 21:11:16]

no

     ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
     file_thread_.Start();
   }
 
-  virtual void TearDown() {
+  virtual void TearDown() OVERRIDE {
     WaitForFileThread();
   }
 
   static void PostQuitToUIThread() {
     BrowserThread::PostTask(BrowserThread::UI,
                             FROM_HERE,
                             base::MessageLoop::QuitClosure());
   }
 
   static void WaitForFileThread() {
     BrowserThread::PostTask(BrowserThread::FILE,
                             FROM_HERE,
                             base::Bind(&PostQuitToUIThread));
     base::MessageLoop::current()->Run();
   }
 
   base::MessageLoop message_loop_;
 
  private:
-  chrome::test::TestStorageMonitor monitor_;
+  // Weak pointer to TestingBrowserProcess-owned storage monitor.

[vandebo (ex-Chrome), 2013/07/10 16:57:45]

not weak ptr

[Greg Billock, 2013/07/10 21:11:16]

Done.

+  chrome::test::TestStorageMonitor* monitor_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   base::ScopedTempDir scoped_temp_dir_;
 };
 
 // Test to verify that HasDcim() function returns true for the given media
 // device mount point.
 TEST_F(MediaStorageUtilTest, MediaDeviceAttached) {
   // Create a dummy mount point with DCIM Directory.
   base::FilePath mount_point(CreateMountPoint(true));
@@ skipping 47 matching lines @@
   event.Reset();
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                           base::Bind(&MediaStorageUtil::FilterAttachedDevices,
                                      base::Unretained(&devices), signal_event));
   event.Wait();
 
   EXPECT_TRUE(devices.find(kImageCaptureDeviceId) != devices.end());
 }
 
 }  // namespace chrome