Cleanup: Remove chrome namespace for storage monitor and media galleries.

chrome/browser/storage_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_STORAGE_MONITOR_PORTABLE_DEVICE_WATCHER_WIN_H_
 #define CHROME_BROWSER_STORAGE_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/strings/string16.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
-namespace chrome {
-
-namespace test {
 class TestPortableDeviceWatcherWin;
-}
 
 // This class watches the portable device mount points and sends notifications
 // about the attached/detached media transfer protocol (MTP) devices.
 // This is a singleton class instantiated by StorageMonitorWin. This class is
 // created, destroyed and operates on the UI thread, except for long running
 // tasks it spins off to a SequencedTaskRunner.
 class PortableDeviceWatcherWin {
  public:
   typedef std::vector<string16> StorageObjectIDs;
 
@@ skipping 53 matching lines @@
       const std::string& storage_unique_id);
 
   // Set the volume notifications object to be used when new
   // devices are found.
   void SetNotifications(StorageMonitor::Receiver* notifications);
 
   void EjectDevice(const std::string& device_id,
                    base::Callback<void(StorageMonitor::EjectStatus)> callback);
 
  private:
-  friend class test::TestPortableDeviceWatcherWin;
+  friend class TestPortableDeviceWatcherWin;
 
   // Key: MTP device storage unique id.
   // Value: Metadata for the given storage.
   typedef std::map<std::string, StorageInfo> MTPStorageMap;
 
   // Key: MTP device plug and play ID string.
   // Value: Vector of device storage objects.
   typedef std::map<string16, StorageObjects> MTPDeviceMap;
 
   // Helpers to enumerate existing MTP storage devices.
@@ skipping 24 matching lines @@
 
   // Used by |media_task_runner_| to create cancelable callbacks.
   base::WeakPtrFactory<PortableDeviceWatcherWin> weak_ptr_factory_;
 
   // The notifications object to use to signal newly attached devices.
   StorageMonitor::Receiver* storage_notifications_;
 
   DISALLOW_COPY_AND_ASSIGN(PortableDeviceWatcherWin);
 };
 
-}  // namespace chrome
-
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_PORTABLE_DEVICE_WATCHER_WIN_H_