Revert 187332

> Regularize ownerships and lifecycle for storage monitor platform classes.
> 
> This change regularizes the construction lifecycle of the StorageMonitor implementations so that they always exist for the construction of the Profile, but don't issue any notifications until after that construction is complete. This allows profile-based listeners to be sure they're synchronized with the monitor.
> 
> It also regularizes ownership of all storage-monitor-related objects. The base platform-specific object is owned by the ChromeBrowserMain object, and owns all subsidiary platform-specific objects needed to monitor and/or deal with volumes of various types (i.e. MTP).
> 
> R=vandebo@chromium.org
> BUG=None
> 
> 
> Review URL: https://chromiumcodereview.appspot.com/12334096

TBR=gbillock@chromium.org
Review URL: https://codereview.chromium.org/12789002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187597 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 0 deletions

diff --git a/chrome/browser/chrome_browser_main_linux.h b/chrome/browser/chrome_browser_main_linux.h
index e9f2c43..44e074f 100644
--- a/chrome/browser/chrome_browser_main_linux.h
+++ b/chrome/browser/chrome_browser_main_linux.h
@@ -17,6 +17,10 @@ class StorageMonitorLinux;
 }
 #endif
 
+namespace chrome {
+class MediaTransferProtocolDeviceObserverLinux;
+}
+
 class ChromeBrowserMainPartsLinux : public ChromeBrowserMainPartsPosix {
  public:
   explicit ChromeBrowserMainPartsLinux(
@@ -32,6 +36,9 @@ class ChromeBrowserMainPartsLinux : public ChromeBrowserMainPartsPosix {
 #if !defined(OS_CHROMEOS)
   scoped_refptr<chrome::StorageMonitorLinux> storage_monitor_;
 #endif
+  scoped_ptr<chrome::MediaTransferProtocolDeviceObserverLinux>
+      media_transfer_protocol_device_observer_;
+  bool initialized_media_transfer_protocol_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsLinux);
 };