Rename RemovableDeviceNotifications=>StorageMonitor

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 "chrome/browser/storage_monitor/storage_monitor_linux.h"
 #include "content/public/browser/browser_thread.h"
 #endif
 
 #if defined(USE_LINUX_BREAKPAD)
 #include <stdlib.h>
 
 #include "base/command_line.h"
 #include "base/linux_util.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/app/breakpad_linux.h"
@@ skipping 102 matching lines @@
                                    FROM_HERE,
                                    base::Bind(&GetLinuxDistroCallback));
 #endif
 
   if (IsCrashReportingEnabled(local_state()))
     InitCrashReporter();
 #endif
 
 #if !defined(OS_CHROMEOS)
   const base::FilePath kDefaultMtabPath("/etc/mtab");
-  removable_device_notifications_linux_ =
-      new chrome::RemovableDeviceNotificationsLinux(kDefaultMtabPath);
-  removable_device_notifications_linux_->Init();
+  storage_monitor_ = new chrome::StorageMonitorLinux(kDefaultMtabPath);
+  storage_monitor_->Init();
 #endif
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
     scoped_refptr<base::MessageLoopProxy> loop_proxy;
 #if !defined(OS_CHROMEOS)
     loop_proxy = content::BrowserThread::GetMessageLoopProxyForThread(
         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.
+  // TODO(gbillock): Make this owned by StorageMonitorLinux.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
     media_transfer_protocol_device_observer_.reset(
         new chrome::MediaTransferProtocolDeviceObserverLinux());
     media_transfer_protocol_device_observer_->SetNotifications(
       chrome::StorageMonitor::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;
+  storage_monitor_ = NULL;
 #endif
 
   media_transfer_protocol_device_observer_.reset();
 
   ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
 }