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

Side by Side Diff: chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc

Issue 501263002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/extensions/api/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Just in case Created 6 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 unified diff | Download patch
OLDNEW
1 1
2 // Copyright 2014 The Chromium Authors. All rights reserved. 2 // Copyright 2014 The Chromium Authors. All rights reserved.
3 // Use of this source code is governed by a BSD-style license that can be 3 // Use of this source code is governed by a BSD-style license that can be
4 // found in the LICENSE file. 4 // found in the LICENSE file.
5 5
6 #include "base/lazy_instance.h" 6 #include "base/lazy_instance.h"
7 #include "chrome/browser/extensions/api/image_writer_private/removable_storage_p rovider.h" 7 #include "chrome/browser/extensions/api/image_writer_private/removable_storage_p rovider.h"
8 #include "content/public/browser/browser_thread.h" 8 #include "content/public/browser/browser_thread.h"
9 9
10 namespace extensions { 10 namespace extensions {
11 11
12 // A device list to be returned when testing. 12 // A device list to be returned when testing.
13 static base::LazyInstance<scoped_refptr<StorageDeviceList> > g_test_device_list; 13 static base::LazyInstance<scoped_refptr<StorageDeviceList> > g_test_device_list;
14 14
15 // TODO(haven): Udev code may be duplicated in the Chrome codebase. 15 // TODO(haven): Udev code may be duplicated in the Chrome codebase.
16 // https://code.google.com/p/chromium/issues/detail?id=284898 16 // https://code.google.com/p/chromium/issues/detail?id=284898
17 17
18 void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) { 18 void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) {
19 if (g_test_device_list.Get() != NULL) { 19 if (g_test_device_list.Get().get() != NULL) {
20 content::BrowserThread::PostTask( 20 content::BrowserThread::PostTask(
21 content::BrowserThread::FILE, 21 content::BrowserThread::FILE,
22 FROM_HERE, 22 FROM_HERE,
23 base::Bind(callback, g_test_device_list.Get(), true)); 23 base::Bind(callback, g_test_device_list.Get(), true));
24 return; 24 return;
25 } 25 }
26 26
27 scoped_refptr<StorageDeviceList> device_list(new StorageDeviceList); 27 scoped_refptr<StorageDeviceList> device_list(new StorageDeviceList);
28 28
29 // We need to do some file i/o to get the device block size 29 // We need to do some file i/o to get the device block size
30 content::BrowserThread::PostTaskAndReplyWithResult( 30 content::BrowserThread::PostTaskAndReplyWithResult(
31 content::BrowserThread::FILE, 31 content::BrowserThread::FILE,
32 FROM_HERE, 32 FROM_HERE,
33 base::Bind(PopulateDeviceList, device_list), 33 base::Bind(PopulateDeviceList, device_list),
34 base::Bind(callback, device_list)); 34 base::Bind(callback, device_list));
35 } 35 }
36 36
37 void RemovableStorageProvider::SetDeviceListForTesting( 37 void RemovableStorageProvider::SetDeviceListForTesting(
38 scoped_refptr<StorageDeviceList> device_list) { 38 scoped_refptr<StorageDeviceList> device_list) {
39 g_test_device_list.Get() = device_list; 39 g_test_device_list.Get() = device_list;
40 } 40 }
41 41
42 void RemovableStorageProvider::ClearDeviceListForTesting() { 42 void RemovableStorageProvider::ClearDeviceListForTesting() {
43 g_test_device_list.Get() = NULL; 43 g_test_device_list.Get() = NULL;
44 } 44 }
45 45
46 } // namespace extensions 46 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698