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

Side by Side Diff: chrome/browser/storage_monitor/storage_monitor_unittest.cc

Issue 16472007: Rename StorageMonitor Initialize function to EnsureInitialized for better understanding. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update comments Created 7 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/message_loop.h" 5 #include "base/message_loop.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "base/synchronization/waitable_event.h" 7 #include "base/synchronization/waitable_event.h"
8 #include "chrome/browser/storage_monitor/mock_removable_storage_observer.h" 8 #include "chrome/browser/storage_monitor/mock_removable_storage_observer.h"
9 #include "chrome/browser/storage_monitor/storage_monitor.h" 9 #include "chrome/browser/storage_monitor/storage_monitor.h"
10 #include "chrome/browser/storage_monitor/test_storage_monitor.h" 10 #include "chrome/browser/storage_monitor/test_storage_monitor.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 namespace chrome { 13 namespace chrome {
14 14
15 TEST(StorageMonitorTest, TestInitialize) { 15 TEST(StorageMonitorTest, TestInitialize) {
16 test::TestStorageMonitor monitor; 16 test::TestStorageMonitor monitor;
17 EXPECT_FALSE(monitor.init_called_); 17 EXPECT_FALSE(monitor.init_called_);
18 18
19 base::WaitableEvent event(false, false); 19 base::WaitableEvent event(false, false);
20 monitor.Initialize(base::Bind(&base::WaitableEvent::Signal, 20 monitor.EnsureInitialized(base::Bind(&base::WaitableEvent::Signal,
21 base::Unretained(&event))); 21 base::Unretained(&event)));
22 EXPECT_TRUE(monitor.init_called_); 22 EXPECT_TRUE(monitor.init_called_);
23 EXPECT_FALSE(event.IsSignaled()); 23 EXPECT_FALSE(event.IsSignaled());
24 monitor.MarkInitialized(); 24 monitor.MarkInitialized();
25 EXPECT_TRUE(event.IsSignaled()); 25 EXPECT_TRUE(event.IsSignaled());
26 } 26 }
27 27
28 TEST(StorageMonitorTest, DeviceAttachDetachNotifications) { 28 TEST(StorageMonitorTest, DeviceAttachDetachNotifications) {
29 base::MessageLoop message_loop; 29 base::MessageLoop message_loop;
30 const string16 kDeviceName = ASCIIToUTF16("media device"); 30 const string16 kDeviceName = ASCIIToUTF16("media device");
31 const std::string kDeviceId1 = "dcim:UUID:FFF0-0001"; 31 const std::string kDeviceId1 = "dcim:UUID:FFF0-0001";
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 EXPECT_EQ(kDeviceName2, devices[0].name()); 119 EXPECT_EQ(kDeviceName2, devices[0].name());
120 EXPECT_EQ(kDevicePath2.value(), devices[0].location()); 120 EXPECT_EQ(kDevicePath2.value(), devices[0].location());
121 121
122 monitor.receiver()->ProcessDetach(kDeviceId2); 122 monitor.receiver()->ProcessDetach(kDeviceId2);
123 message_loop.RunUntilIdle(); 123 message_loop.RunUntilIdle();
124 devices = monitor.GetAllAvailableStorages(); 124 devices = monitor.GetAllAvailableStorages();
125 EXPECT_EQ(0U, devices.size()); 125 EXPECT_EQ(0U, devices.size());
126 } 126 }
127 127
128 } // namespace chrome 128 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/storage_monitor/storage_monitor.cc ('k') | chrome/browser/ui/webui/options/media_galleries_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698