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

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

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again 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 | Annotate | Revision Log
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 <windows.h> 5 #include <windows.h>
6 #include <dbt.h> 6 #include <dbt.h>
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 string16* storage_object_id); 64 string16* storage_object_id);
65 65
66 scoped_ptr<TestStorageMonitorWin> monitor_; 66 scoped_ptr<TestStorageMonitorWin> monitor_;
67 67
68 // Weak pointer; owned by the device notifications class. 68 // Weak pointer; owned by the device notifications class.
69 TestVolumeMountWatcherWin* volume_mount_watcher_; 69 TestVolumeMountWatcherWin* volume_mount_watcher_;
70 70
71 MockRemovableStorageObserver observer_; 71 MockRemovableStorageObserver observer_;
72 72
73 private: 73 private:
74 MessageLoopForUI message_loop_; 74 base::MessageLoopForUI message_loop_;
75 content::TestBrowserThread ui_thread_; 75 content::TestBrowserThread ui_thread_;
76 content::TestBrowserThread file_thread_; 76 content::TestBrowserThread file_thread_;
77 }; 77 };
78 78
79 StorageMonitorWinTest::StorageMonitorWinTest() 79 StorageMonitorWinTest::StorageMonitorWinTest()
80 : ui_thread_(BrowserThread::UI, &message_loop_), 80 : ui_thread_(BrowserThread::UI, &message_loop_),
81 file_thread_(BrowserThread::FILE, &message_loop_) { 81 file_thread_(BrowserThread::FILE, &message_loop_) {
82 } 82 }
83 83
84 StorageMonitorWinTest::~StorageMonitorWinTest() { 84 StorageMonitorWinTest::~StorageMonitorWinTest() {
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 pnp_device_id); 536 pnp_device_id);
537 EXPECT_EQ(it->object_persistent_id, 537 EXPECT_EQ(it->object_persistent_id,
538 TestPortableDeviceWatcherWin::GetMTPStorageUniqueId( 538 TestPortableDeviceWatcherWin::GetMTPStorageUniqueId(
539 pnp_device_id, storage_object_id)); 539 pnp_device_id, storage_object_id));
540 } 540 }
541 DoMTPDeviceTest(TestPortableDeviceWatcherWin::kMTPDeviceWithValidInfo, false); 541 DoMTPDeviceTest(TestPortableDeviceWatcherWin::kMTPDeviceWithValidInfo, false);
542 } 542 }
543 543
544 } // namespace test 544 } // namespace test
545 } // namespace chrome 545 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/storage_monitor/storage_monitor_unittest.cc ('k') | chrome/browser/sync/about_sync_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698