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

Unified Diff: chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc

Issue 12334096: Regularize ownerships and lifecycle for storage monitor platform classes. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: in progress... changed to not require mtp manager in linux for tests. Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc
diff --git a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc
index f8cbc09bf4d1755490ed4b1b2973c1954dcc1a2a..479fc6a318b58787b2b6254f698bba2f0fc7e0ba 100644
--- a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc
+++ b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc
@@ -128,8 +128,11 @@ MediaTransferProtocolDeviceObserverLinux()
device::MediaTransferProtocolManager* mtp_manager =
device::MediaTransferProtocolManager::GetInstance();
- mtp_manager->AddObserver(this);
- EnumerateStorages();
+ // May be null in unit tests.
+ if (mtp_manager) {
Lei Zhang 2013/02/28 02:14:43 As is, |mtp_manager| is always true here, because
Greg Billock 2013/02/28 22:35:37 That sounds like a great option. I'll add that to
+ mtp_manager->AddObserver(this);
+ EnumerateStorages();
+ }
}
// This constructor is only used by unit tests.

Powered by Google App Engine
This is Rietveld 408576698