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

chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.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 "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
@@ skipping 42 matching lines @@
 
 }  // namespace
 
 class MediaGalleriesPrivateApiTest : public ExtensionApiTest {
  public:
   MediaGalleriesPrivateApiTest() {}
   virtual ~MediaGalleriesPrivateApiTest() {}
 
   // ExtensionApiTest overrides.
   virtual void SetUp() OVERRIDE {
-    device_id_ = chrome::StorageInfo::MakeDeviceId(
-        chrome::StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM, kDeviceId);
+    device_id_ = StorageInfo::MakeDeviceId(
+        StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM, kDeviceId);
     ExtensionApiTest::SetUp();
   }
 
  protected:
   // ExtensionApiTest overrides.
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(switches::kWhitelistedExtensionID,
                                     kTestExtensionId);
   }
 
   void ChangeListener(content::RenderViewHost* host,
                       const std::string& js_command,
                       const std::string& ok_message) {
     ExtensionTestMessageListener listener(ok_message, false  /* no reply */);
     host->ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16(js_command));
     EXPECT_TRUE(listener.WaitUntilSatisfied());
   }
 
   void AttachDetach() {
     Attach();
     Detach();
   }
 
   void Attach() {
-    DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized());
-    chrome::StorageInfo info(device_id_, ASCIIToUTF16(kDeviceName), kDevicePath,
-                             string16(), string16(), string16(), 0);
-    chrome::StorageMonitor::GetInstance()->receiver()->ProcessAttach(info);
+    DCHECK(StorageMonitor::GetInstance()->IsInitialized());
+    StorageInfo info(device_id_, ASCIIToUTF16(kDeviceName), kDevicePath,
+                     string16(), string16(), string16(), 0);
+    StorageMonitor::GetInstance()->receiver()->ProcessAttach(info);
     content::RunAllPendingInMessageLoop();
   }
 
   void Detach() {
-    DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized());
-    chrome::StorageMonitor::GetInstance()->receiver()->ProcessDetach(
-        device_id_);
+    DCHECK(StorageMonitor::GetInstance()->IsInitialized());
+    StorageMonitor::GetInstance()->receiver()->ProcessDetach(device_id_);
     content::RunAllPendingInMessageLoop();
   }
 
  private:
   std::string device_id_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPrivateApiTest);
 };
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateApiTest, DeviceAttachDetachEvents) {
   // Setup.
-  chrome::test::TestStorageMonitor::SyncInitialize();
+  TestStorageMonitor::SyncInitialize();
   const extensions::Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII(kTestExtensionPath));
   ASSERT_TRUE(extension);
 
   content::RenderViewHost* host =
       extensions::ExtensionSystem::Get(browser()->profile())->
           process_manager()->GetBackgroundHostForExtension(extension->id())->
               render_view_host();
   ASSERT_TRUE(host);
 
@@ skipping 53 matching lines @@
   Attach();
   EXPECT_TRUE(attach_finished_listener.WaitUntilSatisfied());
   Detach();
   EXPECT_TRUE(detach_finished_listener.WaitUntilSatisfied());
 
   Attach();
   EXPECT_TRUE(attach_finished_listener.WaitUntilSatisfied());
   Detach();
   EXPECT_TRUE(detach_finished_listener.WaitUntilSatisfied());
 }