Regularize ownerships and lifecycle for storage monitor platform classes.

chrome/browser/chrome_browser_main_linux.cc

Index: chrome/browser/chrome_browser_main_linux.cc
diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc
index 3940a052e4d7cbae289b2494849f70c45976e311..6f60771104034bddd3d18edf958ec2f1c3ef5211 100644
--- a/chrome/browser/chrome_browser_main_linux.cc
+++ b/chrome/browser/chrome_browser_main_linux.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/chrome_browser_main_linux.h"
 
 #include "base/message_loop_proxy.h"
-#include "chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h"
 #include "chrome/common/chrome_switches.h"
 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
@@ -152,14 +151,6 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
 }
 
 void ChromeBrowserMainPartsLinux::PostProfileInit() {
-  // TODO(gbillock): Make this owned by RemovableDeviceNotificationsLinux.
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
-    media_transfer_protocol_device_observer_.reset(
-        new chrome::MediaTransferProtocolDeviceObserverLinux());
-    media_transfer_protocol_device_observer_->SetNotifications(
-      chrome::RemovableStorageNotifications::GetInstance()->receiver());
-  }
-
   ChromeBrowserMainPartsPosix::PostProfileInit();
 }
 
@@ -171,7 +162,5 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
   removable_device_notifications_linux_ = NULL;
 #endif
 
-  media_transfer_protocol_device_observer_.reset();
-
   ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
 }