commit 5a8f860a01279d4decbd788ba91ab6331505bfc8
author Niels Möller <nisse@webrtc.org> Wed Jun 12 11:30:59 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Thu Jun 13 13:51:17 2019 +0000
tree 5e0a072b7aac512355804c8029e612afe4518865
parent 50dd80b96f393646967099ef28b79caebf3cfcf3

Prepare for deletion of the NO_MAIN_THREAD_WRAPPING preprocessor define

This is a partial reland of
https://webrtc-review.googlesource.com/c/src/+/39680,
including only the (hopefully) non-problematic parts of it, but
postponing actual deletion of automatic thread wrapping.

Bug: webrtc:9714
Change-Id: I9b79dd073f0e945cbb62f3b54cff05eaaea9b06c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/141664
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28265}

sdk/BUILD.gn

diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 60be6db..6036a4d 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -1125,6 +1125,7 @@
             ":peerconnectionfactory_base_objc",
             ":sdk_unittests_bundle_data",
             ":sdk_unittests_sources",
+            "../rtc_base",
             "//test:test_support",
           ]
           ldflags = [ "-all_load" ]
@@ -1143,6 +1144,7 @@
           deps = [
             ":framework_objc+link",
             ":ios_framework_bundle",
+            "../rtc_base",
             "//test:test_support",
           ]
         }

sdk/objc/unittests/main.mm

diff --git a/sdk/objc/unittests/main.mm b/sdk/objc/unittests/main.mm
index 77a88a6..9c51376 100644
--- a/sdk/objc/unittests/main.mm
+++ b/sdk/objc/unittests/main.mm
@@ -10,11 +10,14 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
+#include "rtc_base/thread.h"
 #include "test/ios/coverage_util_ios.h"
 
 int main(int argc, char* argv[]) {
   rtc::test::ConfigureCoverageReportPath();
 
+  rtc::AutoThread main_thread;
+
   @autoreleasepool {
     return UIApplicationMain(argc, argv, nil, nil);
   }