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

chrome/browser/media_galleries/media_galleries_preferences_unittest.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.
 
 // MediaGalleriesPreferences unit tests.
 
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
@@ skipping 15 matching lines @@
 #include "sync/api/string_ordinal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #endif
 
-namespace chrome {
-
 namespace {
 
 class MockGalleryChangeObserver
     : public MediaGalleriesPreferences::GalleryChangeObserver {
  public:
   explicit MockGalleryChangeObserver(MediaGalleriesPreferences* pref)
       : pref_(pref),
         notifications_(0) {}
   virtual ~MockGalleryChangeObserver() {}
 
@@ skipping 24 matching lines @@
 
   MediaGalleriesPreferencesTest()
       : profile_(new TestingProfile()),
         default_galleries_count_(0) {
   }
 
   virtual ~MediaGalleriesPreferencesTest() {
   }
 
   virtual void SetUp() OVERRIDE {
-    ASSERT_TRUE(test::TestStorageMonitor::CreateAndInstall());
+    ASSERT_TRUE(TestStorageMonitor::CreateAndInstall());
 
     extensions::TestExtensionSystem* extension_system(
         static_cast<extensions::TestExtensionSystem*>(
             extensions::ExtensionSystem::Get(profile_.get())));
     extension_system->CreateExtensionService(
         CommandLine::ForCurrentProcess(), base::FilePath(), false);
 
     gallery_prefs_.reset(new MediaGalleriesPreferences(profile_.get()));
 
     // Load the default galleries into the expectations.
@@ skipping 19 matching lines @@
     all_permission_extension =
         AddMediaGalleriesApp("all", all_permissions, profile_.get());
     regular_permission_extension =
         AddMediaGalleriesApp("regular", read_permissions, profile_.get());
     no_permissions_extension =
         AddMediaGalleriesApp("no", read_permissions, profile_.get());
   }
 
   virtual void TearDown() OVERRIDE {
     Verify();
-    test::TestStorageMonitor::RemoveSingleton();
+    TestStorageMonitor::RemoveSingleton();
   }
 
   void Verify() {
     const MediaGalleriesPrefInfoMap& known_galleries =
         gallery_prefs_->known_galleries();
     EXPECT_EQ(expected_galleries_.size(), known_galleries.size());
     for (MediaGalleriesPrefInfoMap::const_iterator it = known_galleries.begin();
          it != known_galleries.end();
          ++it) {
       VerifyGalleryInfo(it->second, it->first);
@@ skipping 102 matching lines @@
  private:
   // Needed for extension service & friends to work.
   content::TestBrowserThreadBundle thread_bundle_;
 
 #if defined OS_CHROMEOS
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
   chromeos::ScopedTestUserManager test_user_manager_;
 #endif
 
-  test::TestStorageMonitor monitor_;
+  TestStorageMonitor monitor_;
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<MediaGalleriesPreferences> gallery_prefs_;
 
   uint64 default_galleries_count_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPreferencesTest);
 };
 
 base::FilePath MakePath(std::string dir) {
 #if defined(OS_WIN)
@@ skipping 543 matching lines @@
   Verify();
   EXPECT_EQ(1, observer.notifications());
 
   // No gallery for type.
   std::string new_device_id =
       StorageInfo::MakeDeviceId(StorageInfo::PICASA, path.AsUTF8Unsafe());
   EXPECT_FALSE(UpdateDeviceIDForSingletonType(new_device_id));
 }
 
 TEST(MediaGalleryPrefInfoTest, NameGeneration) {
-  ASSERT_TRUE(test::TestStorageMonitor::CreateAndInstall());
+  ASSERT_TRUE(TestStorageMonitor::CreateAndInstall());
 
   MediaGalleryPrefInfo info;
   info.pref_id = 1;
   info.display_name = ASCIIToUTF16("override");
   info.device_id = StorageInfo::MakeDeviceId(
       StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM, "unique");
 
   EXPECT_EQ(ASCIIToUTF16("override"), info.GetGalleryDisplayName());
 
   info.display_name = ASCIIToUTF16("o2");
@@ skipping 19 matching lines @@
   info.display_name = string16();
   EXPECT_EQ(ASCIIToUTF16("vol"), info.GetGalleryDisplayName());
   info.volume_label = string16();
   EXPECT_EQ(ASCIIToUTF16("vendor, model"), info.GetGalleryDisplayName());
 
   info.device_id = StorageInfo::MakeDeviceId(
       StorageInfo::FIXED_MASS_STORAGE, "unique");
   EXPECT_EQ(base::FilePath(FILE_PATH_LITERAL("unique")).AsUTF8Unsafe(),
             UTF16ToUTF8(info.GetGalleryTooltip()));
 
-  test::TestStorageMonitor::RemoveSingleton();
+  TestStorageMonitor::RemoveSingleton();
 }
-
-}  // namespace chrome