Regularize ownerships and lifecycle for storage monitor platform classes.

chrome/browser/chrome_browser_main_linux.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 "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"
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/storage_monitor/removable_device_notifications_linux.h"
 #include "content/public/browser/browser_thread.h"
 #endif
 
 #if defined(USE_LINUX_BREAKPAD)
 #include <stdlib.h>
@@ skipping 126 matching lines @@
         content::BrowserThread::FILE);
 #endif
     device::MediaTransferProtocolManager::Initialize(loop_proxy);
     initialized_media_transfer_protocol_manager_ = true;
   }
 
   ChromeBrowserMainPartsPosix::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();
 }
 
 void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
 #if !defined(OS_CHROMEOS)
   // Release it now. Otherwise the FILE thread would be gone when we try to
   // release it in the dtor and Valgrind would report a leak on almost ever
   // single browser_test.
   removable_device_notifications_linux_ = NULL;
 #endif
 
-  media_transfer_protocol_device_observer_.reset();
-
   ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
 }