[Media Gallery] Added code to support mtp device media file system on Windows.

chrome/browser/system_monitor/portable_device_watcher_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYSTEM_MONITOR_PORTABLE_DEVICE_WATCHER_WIN_H_
 #define CHROME_BROWSER_SYSTEM_MONITOR_PORTABLE_DEVICE_WATCHER_WIN_H_
 
 #include <portabledeviceapi.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
+#include "base/synchronization/lock.h"
 #include "base/system_monitor/system_monitor.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 class FilePath;
 
 namespace chrome {
 
@@ skipping 37 matching lines @@
   virtual ~PortableDeviceWatcherWin();
 
   // Must be called after the browser blocking pool is ready for use.
   // RemovableDeviceNotificationsWindowsWin::Init() will call this function.
   void Init(HWND hwnd);
 
   // Processes DEV_BROADCAST_DEVICEINTERFACE messages and triggers a
   // SystemMonitor notification if appropriate.
   void OnWindowMessage(UINT event_type, LPARAM data);
 
+  // Gets the information of the MTP storage specified by |storage_device_id|.
+  // On success, returns true and fills in |device_location| with device
+  // interface details and |storage_object_id| with storage object temporary
+  // identifier.
+  bool GetMTPStorageInfoFromDeviceId(const std::string& storage_device_id,
+                                     string16* device_location,
+                                     string16* storage_object_id);
+
  private:
   friend class TestPortableDeviceWatcherWin;
 
   // Key: MTP device storage unique id.
   // Value: Metadata for the given storage.
   typedef std::map<std::string, base::SystemMonitor::RemovableStorageInfo>
       MTPStorageMap;
 
   // Key: MTP device plug and play ID string.
   // Value: Vector of device storage objects.
@@ skipping 14 matching lines @@
 
   // The portable device notifications handle.
   HDEVNOTIFY notifications_;
 
   // Attached media transfer protocol device map.
   MTPDeviceMap device_map_;
 
   // Attached media transfer protocol device storage objects map.
   MTPStorageMap storage_map_;
 
+  // The lock to protect |device_map_| and |storage_map_|.
+  // TODO(kmadhusu): Remove this after fixing crbug.com/154835.
+  base::Lock lock_;
+
   // The task runner used to execute tasks that may take a long time and thus
   // should not be performed on the UI thread.
   scoped_refptr<base::SequencedTaskRunner> media_task_runner_;
 
   // Used by |media_task_runner_| to create cancelable callbacks.
   base::WeakPtrFactory<PortableDeviceWatcherWin> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PortableDeviceWatcherWin);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_SYSTEM_MONITOR_PORTABLE_DEVICE_WATCHER_WIN_H_