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

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

Issue 14016002: Storage Monitor: Make StorageMonitorLinux own the MediaTransferProtocolManager. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix browser_tests Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/storage_monitor/test_storage_monitor.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "chrome/browser/storage_monitor/test_storage_monitor.h" 5 #include "chrome/browser/storage_monitor/test_storage_monitor.h"
6 6
7 #include "chrome/browser/storage_monitor/media_storage_util.h" 7 #include "chrome/browser/storage_monitor/media_storage_util.h"
8 8
9 #if defined(OS_LINUX)
10 #include "chrome/browser/storage_monitor/test_media_transfer_protocol_manager_li nux.h"
11 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
12 #endif
13
9 namespace chrome { 14 namespace chrome {
10 namespace test { 15 namespace test {
11 16
12 TestStorageMonitor::TestStorageMonitor() 17 TestStorageMonitor::TestStorageMonitor()
13 : StorageMonitor() {} 18 : StorageMonitor() {
19 #if defined(OS_LINUX)
20 media_transfer_protocol_manager_.reset(
21 new TestMediaTransferProtocolManagerLinux());
22 #endif
23 }
14 24
15 TestStorageMonitor::~TestStorageMonitor() {} 25 TestStorageMonitor::~TestStorageMonitor() {}
16 26
17 TestStorageMonitor* 27 TestStorageMonitor*
18 TestStorageMonitor::CreateForBrowserTests() { 28 TestStorageMonitor::CreateForBrowserTests() {
19 StorageMonitor::RemoveSingletonForTesting(); 29 StorageMonitor::RemoveSingletonForTesting();
20 return new TestStorageMonitor(); 30 return new TestStorageMonitor();
21 } 31 }
22 32
23 bool TestStorageMonitor::GetStorageInfoForPath( 33 bool TestStorageMonitor::GetStorageInfoForPath(
(...skipping 14 matching lines...) Expand all
38 48
39 #if defined(OS_WIN) 49 #if defined(OS_WIN)
40 bool TestStorageMonitor::GetMTPStorageInfoFromDeviceId( 50 bool TestStorageMonitor::GetMTPStorageInfoFromDeviceId(
41 const std::string& storage_device_id, 51 const std::string& storage_device_id,
42 string16* device_location, 52 string16* device_location,
43 string16* storage_object_id) const { 53 string16* storage_object_id) const {
44 return false; 54 return false;
45 } 55 }
46 #endif 56 #endif
47 57
58 #if defined(OS_LINUX)
59 device::MediaTransferProtocolManager*
60 TestStorageMonitor::media_transfer_protocol_manager() {
61 return media_transfer_protocol_manager_.get();
62 }
63 #endif
64
48 StorageMonitor::Receiver* TestStorageMonitor::receiver() const { 65 StorageMonitor::Receiver* TestStorageMonitor::receiver() const {
49 return StorageMonitor::receiver(); 66 return StorageMonitor::receiver();
50 } 67 }
51 68
52 void TestStorageMonitor::EjectDevice( 69 void TestStorageMonitor::EjectDevice(
53 const std::string& device_id, 70 const std::string& device_id,
54 base::Callback<void(EjectStatus)> callback) { 71 base::Callback<void(EjectStatus)> callback) {
55 ejected_device_ = device_id; 72 ejected_device_ = device_id;
56 callback.Run(EJECT_OK); 73 callback.Run(EJECT_OK);
57 } 74 }
58 75
59 } // namespace test 76 } // namespace test
60 } // namespace chrome 77 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/storage_monitor/test_storage_monitor.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698