Regularize ownerships and lifecycle for storage monitor platform classes.

chrome/browser/chrome_browser_main_mac.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.
 
 #include "chrome/browser/chrome_browser_main_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <sys/sysctl.h>
 
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/files/file_path.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "chrome/app/breakpad_mac.h"
 #import "chrome/browser/app_controller_mac.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
 #include "chrome/browser/mac/install_from_dmg.h"
 #include "chrome/browser/mac/keychain_reauthorize.h"
 #import "chrome/browser/mac/keystone_glue.h"
 #include "chrome/browser/metrics/metrics_service.h"
-#include "chrome/browser/storage_monitor/image_capture_device_manager.h"
 #include "chrome/browser/storage_monitor/storage_monitor_mac.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/result_codes.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/resource/resource_handle.h"
 
 namespace {
@@ skipping 240 matching lines @@
   DCHECK([NSApp delegate]);
 
   // Prevent Cocoa from turning command-line arguments into
   // |-application:openFiles:|, since we already handle them directly.
   [[NSUserDefaults standardUserDefaults]
       setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"];
 }
 
 void ChromeBrowserMainPartsMac::PreProfileInit() {
   storage_monitor_ = new chrome::StorageMonitorMac();
-  // TODO(gbillock): Make the ImageCapture manager owned by StorageMonitorMac.
-  if (base::mac::IsOSLionOrLater()) {
-    image_capture_device_manager_.reset(new chrome::ImageCaptureDeviceManager);
-    image_capture_device_manager_->SetNotifications(
-        storage_monitor_->receiver());
-  }
 
   ChromeBrowserMainPartsPosix::PreProfileInit();
 }
 
+void ChromeBrowserMainPartsMac::PostProfileInit() {
+  storage_monitor_->Init();
+
+  ChromeBrowserMainPartsPosix::PostProfileInit();
+}
+
 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
   AppController* appController = [NSApp delegate];
   [appController didEndMainMessageLoop];
 }