Bug 1228479 - Remove redundant blob handling in BluetoothMapRequestHandle::ReplyToFolderListing, r=shuang
authorBen Tian <btian@mozilla.com>
Fri, 27 Nov 2015 14:03:03 +0800
changeset 308490 c5badd4341fa6635d0c619f58b58545ab3262acc
parent 308489 c7039bfe59d554c68e1840a7b5f1fb692452bcb1
child 308491 a7420eb9ad98bfad8fc600c5b3bf3026bee3f9ee
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersshuang
bugs1228479
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1228479 - Remove redundant blob handling in BluetoothMapRequestHandle::ReplyToFolderListing, r=shuang
dom/bluetooth/common/webapi/BluetoothMapRequestHandle.cpp
--- a/dom/bluetooth/common/webapi/BluetoothMapRequestHandle.cpp
+++ b/dom/bluetooth/common/webapi/BluetoothMapRequestHandle.cpp
@@ -61,30 +61,18 @@ BluetoothMapRequestHandle::ReplyToFolder
   NS_ENSURE_TRUE(!aRv.Failed(), nullptr);
 
   BluetoothService* bs = BluetoothService::Get();
   if (!bs) {
     aRv.Throw(NS_ERROR_FAILURE);
     return nullptr;
   }
 
-  if (XRE_GetProcessType() == GeckoProcessType_Default) {
-    // In-process reply
-    bs->ReplyToMapFolderListing(aMasId, aFolderlists,
-      new BluetoothVoidReplyRunnable(nullptr, promise));
-  } else {
-    ContentChild *cc = ContentChild::GetSingleton();
-    if (!cc) {
-      aRv.Throw(NS_ERROR_FAILURE);
-      return nullptr;
-    }
-
-    bs->ReplyToMapFolderListing(aMasId, aFolderlists,
-      new BluetoothVoidReplyRunnable(nullptr, promise));
-  }
+  bs->ReplyToMapFolderListing(aMasId, aFolderlists,
+    new BluetoothVoidReplyRunnable(nullptr, promise));
 
   return promise.forget();
 }
 
 already_AddRefed<Promise>
 BluetoothMapRequestHandle::ReplyToMessagesListing(long aMasId,
                                                   Blob& aBlob,
                                                   bool aNewMessage,