Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3134)

Unified Diff: chrome/browser/storage_monitor/storage_monitor_unittest.cc

Issue 23727009: Cleanup: Remove chrome namespace for storage monitor and media galleries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nit Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/storage_monitor/storage_monitor_unittest.cc
diff --git a/chrome/browser/storage_monitor/storage_monitor_unittest.cc b/chrome/browser/storage_monitor/storage_monitor_unittest.cc
index ca85346dab28f82674dcbc246ad8e4cad9dd4328..afe0891d5c685c146da0bfa167072cb7c666d297 100644
--- a/chrome/browser/storage_monitor/storage_monitor_unittest.cc
+++ b/chrome/browser/storage_monitor/storage_monitor_unittest.cc
@@ -18,11 +18,9 @@ void SetLatch(bool* called) {
} // namespace
-namespace chrome {
-
TEST(StorageMonitorTest, TestInitialize) {
- test::TestStorageMonitor::RemoveSingleton();
- test::TestStorageMonitor monitor;
+ TestStorageMonitor::RemoveSingleton();
+ TestStorageMonitor monitor;
EXPECT_FALSE(monitor.init_called());
bool initialized = false;
@@ -34,14 +32,14 @@ TEST(StorageMonitorTest, TestInitialize) {
}
TEST(StorageMonitorTest, DeviceAttachDetachNotifications) {
- test::TestStorageMonitor::RemoveSingleton();
+ TestStorageMonitor::RemoveSingleton();
base::MessageLoop message_loop;
const string16 kDeviceName = ASCIIToUTF16("media device");
const std::string kDeviceId1 = "dcim:UUID:FFF0-0001";
const std::string kDeviceId2 = "dcim:UUID:FFF0-0002";
MockRemovableStorageObserver observer1;
MockRemovableStorageObserver observer2;
- test::TestStorageMonitor monitor;
+ TestStorageMonitor monitor;
monitor.AddObserver(&observer1);
monitor.AddObserver(&observer2);
@@ -82,17 +80,17 @@ TEST(StorageMonitorTest, DeviceAttachDetachNotifications) {
}
TEST(StorageMonitorTest, GetAllAvailableStoragesEmpty) {
- test::TestStorageMonitor::RemoveSingleton();
+ TestStorageMonitor::RemoveSingleton();
base::MessageLoop message_loop;
- test::TestStorageMonitor monitor;
+ TestStorageMonitor monitor;
std::vector<StorageInfo> devices = monitor.GetAllAvailableStorages();
EXPECT_EQ(0U, devices.size());
}
TEST(StorageMonitorTest, GetAllAvailableStorageAttachDetach) {
- test::TestStorageMonitor::RemoveSingleton();
+ TestStorageMonitor::RemoveSingleton();
base::MessageLoop message_loop;
- test::TestStorageMonitor monitor;
+ TestStorageMonitor monitor;
const std::string kDeviceId1 = "dcim:UUID:FFF0-0042";
const string16 kDeviceName1 = ASCIIToUTF16("test");
const base::FilePath kDevicePath1(FILE_PATH_LITERAL("/testfoo"));
@@ -135,5 +133,3 @@ TEST(StorageMonitorTest, GetAllAvailableStorageAttachDetach) {
devices = monitor.GetAllAvailableStorages();
EXPECT_EQ(0U, devices.size());
}
-
-} // namespace chrome
« no previous file with comments | « chrome/browser/storage_monitor/storage_monitor_mac_unittest.mm ('k') | chrome/browser/storage_monitor/storage_monitor_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698