From 69d7f89d6a93e0fbce451960287066195c6d4ea0 Mon Sep 17 00:00:00 2001 From: "dcheng@chromium.org" Date: Tue, 9 Apr 2013 06:41:12 +0000 Subject: Revert "Rewrite std::string("") to std::string(), Linux edition." This reverts commit e59558b78e8c6a1b0bd916a724724b638c3c91b6. Revert "Fix build after r193020." This reverts commit 558a35897f6b3ffbcaefde927c1f150b815d140a. Revert "Really fix build after r193020." This reverts commit e3748a79b523a8d365d4a33ef986eebb4186fa78. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193030 0039d316-1c4b-4281-b951-d872f2087c98 --- device/media_transfer_protocol/media_transfer_protocol_manager.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'device/media_transfer_protocol') diff --git a/device/media_transfer_protocol/media_transfer_protocol_manager.cc b/device/media_transfer_protocol/media_transfer_protocol_manager.cc index d3fce03..bbd13b3 100644 --- a/device/media_transfer_protocol/media_transfer_protocol_manager.cc +++ b/device/media_transfer_protocol/media_transfer_protocol_manager.cc @@ -111,7 +111,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager { const OpenStorageCallback& callback) OVERRIDE { DCHECK(thread_checker_.CalledOnValidThread()); if (!ContainsKey(storage_info_map_, storage_name)) { - callback.Run(std::string(), true); + callback.Run("", true); return; } open_storage_callbacks_.push(callback); @@ -333,13 +333,13 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager { open_storage_callbacks_.front().Run(handle, false); } else { NOTREACHED(); - open_storage_callbacks_.front().Run(std::string(), true); + open_storage_callbacks_.front().Run("", true); } open_storage_callbacks_.pop(); } void OnOpenStorageError() { - open_storage_callbacks_.front().Run(std::string(), true); + open_storage_callbacks_.front().Run("", true); open_storage_callbacks_.pop(); } -- cgit v1.1