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

Side by Side Diff: components/storage_monitor/storage_monitor_win_unittest.cc

Issue 1837483003: Move base::FreeDeleter into its own header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/free_deleter.h"
13 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
15 #include "base/run_loop.h" 16 #include "base/run_loop.h"
16 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
17 #include "base/synchronization/waitable_event.h" 18 #include "base/synchronization/waitable_event.h"
18 #include "components/storage_monitor/mock_removable_storage_observer.h" 19 #include "components/storage_monitor/mock_removable_storage_observer.h"
19 #include "components/storage_monitor/portable_device_watcher_win.h" 20 #include "components/storage_monitor/portable_device_watcher_win.h"
20 #include "components/storage_monitor/removable_device_constants.h" 21 #include "components/storage_monitor/removable_device_constants.h"
21 #include "components/storage_monitor/storage_info.h" 22 #include "components/storage_monitor/storage_info.h"
22 #include "components/storage_monitor/storage_monitor_win.h" 23 #include "components/storage_monitor/storage_monitor_win.h"
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 TestPortableDeviceWatcherWin::kMTPDeviceWithValidInfo); 542 TestPortableDeviceWatcherWin::kMTPDeviceWithValidInfo);
542 EXPECT_EQ(expected, pnp_device_id); 543 EXPECT_EQ(expected, pnp_device_id);
543 EXPECT_EQ(it->object_persistent_id, 544 EXPECT_EQ(it->object_persistent_id,
544 TestPortableDeviceWatcherWin::GetMTPStorageUniqueId( 545 TestPortableDeviceWatcherWin::GetMTPStorageUniqueId(
545 pnp_device_id, storage_object_id)); 546 pnp_device_id, storage_object_id));
546 } 547 }
547 DoMTPDeviceTest(TestPortableDeviceWatcherWin::kMTPDeviceWithValidInfo, false); 548 DoMTPDeviceTest(TestPortableDeviceWatcherWin::kMTPDeviceWithValidInfo, false);
548 } 549 }
549 550
550 } // namespace storage_monitor 551 } // namespace storage_monitor
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698