[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm

 // 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.
 
 #import <Foundation/Foundation.h>
 #import <ImageCaptureCore/ImageCaptureCore.h>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/mac/cocoa_protocols.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/sequenced_worker_pool_owner.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.h"
 #include "chrome/browser/storage_monitor/image_capture_device_manager.h"
 #include "chrome/browser/storage_monitor/test_storage_monitor.h"
+#include "chrome/test/base/testing_browser_process.h"

[vandebo (ex-Chrome), 2013/07/09 15:38:12]

Needed?

[Greg Billock, 2013/07/09 17:35:21]

nope

 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/file_system_file_util.h"
 
 #if !defined(MAC_OS_X_VERSION_10_7) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
 
 @interface NSObject (ICCameraDeviceDelegateLionAPI)
 - (void)deviceDidBecomeReadyWithCompleteContentCatalog:(ICDevice*)device;
@@ skipping 145 matching lines @@
 
   virtual void SetUp() OVERRIDE {
     ui_thread_.reset(new content::TestBrowserThread(
         content::BrowserThread::UI, &message_loop_));
     file_thread_.reset(new content::TestBrowserThread(
         content::BrowserThread::FILE, &message_loop_));
     io_thread_.reset(new content::TestBrowserThread(
         content::BrowserThread::IO));
     ASSERT_TRUE(io_thread_->Start());
 
-    manager_.SetNotifications(monitor_.receiver());
+    chrome::test::TestStorageMonitor* monitor =
+        chrome::test::TestStorageMonitor::Create();
+    manager_.SetNotifications(monitor->receiver());
 
     camera_ = [MockMTPICCameraDevice alloc];
     id<ICDeviceBrowserDelegate> delegate = manager_.device_browser();
     [delegate deviceBrowser:nil didAddDevice:camera_ moreComing:NO];
 
     delegate_ = new chrome::MTPDeviceDelegateImplMac(kDeviceId, kDevicePath);
   }
 
   void OnError(base::WaitableEvent* event, base::PlatformFileError error) {
     error_ = error;
@@ skipping 99 matching lines @@
     io_thread_->Stop();
   }
 
  protected:
   base::MessageLoopForUI message_loop_;
   // Note: threads must be made in this order: UI > FILE > IO
   scoped_ptr<content::TestBrowserThread> ui_thread_;
   scoped_ptr<content::TestBrowserThread> file_thread_;
   scoped_ptr<content::TestBrowserThread> io_thread_;
   base::ScopedTempDir temp_dir_;
-  chrome::test::TestStorageMonitor monitor_;
   chrome::ImageCaptureDeviceManager manager_;
   MockMTPICCameraDevice* camera_;
 
   // This object needs special deletion inside the above |task_runner_|.
   chrome::MTPDeviceDelegateImplMac* delegate_;
 
   base::PlatformFileError error_;
   base::PlatformFileInfo info_;
   fileapi::AsyncFileUtil::EntryList file_list_;
 
@@ skipping 244 matching lines @@
                          temp_dir_.path().Append("target")));
 
   EXPECT_EQ(base::PLATFORM_FILE_OK,
              DownloadFile(base::FilePath("/ic:id/filename"),
                           temp_dir_.path().Append("target")));
   std::string contents;
   EXPECT_TRUE(file_util::ReadFileToString(temp_dir_.path().Append("target"),
                                           &contents));
   EXPECT_EQ(kTestFileContents, contents);
 }