From beafee3009ac5f17e9e18d9452c3ae8d29ca92b0 Mon Sep 17 00:00:00 2001
From: kthelgason <kthelgason@webrtc.org>
Date: Fri, 16 Dec 2016 02:12:42 -0800
Subject: [PATCH] Move ios_helpers to sdk folder

BUG=webrtc:5582

Review-Url: https://codereview.webrtc.org/2572743004
Cr-Commit-Position: refs/heads/master@{#15649}
---
 webrtc/modules/audio_device/BUILD.gn                        | 2 --
 webrtc/modules/audio_device/DEPS                            | 3 +++
 webrtc/modules/audio_device/ios/audio_device_ios.mm         | 2 +-
 webrtc/sdk/BUILD.gn                                         | 2 ++
 .../helpers_ios.h => sdk/objc/Framework/Classes/helpers.h}  | 6 +++---
 .../objc/Framework/Classes/helpers.mm}                      | 4 +---
 6 files changed, 10 insertions(+), 9 deletions(-)
 rename webrtc/{modules/audio_device/ios/helpers_ios.h => sdk/objc/Framework/Classes/helpers.h} (92%)
 rename webrtc/{modules/audio_device/ios/helpers_ios.mm => sdk/objc/Framework/Classes/helpers.mm} (97%)

diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn
index 0b210dc996..22941484b2 100644
--- a/webrtc/modules/audio_device/BUILD.gn
+++ b/webrtc/modules/audio_device/BUILD.gn
@@ -182,8 +182,6 @@ rtc_static_library("audio_device") {
           "ios/audio_device_ios.mm",
           "ios/audio_device_not_implemented_ios.mm",
           "ios/audio_session_observer.h",
-          "ios/helpers_ios.h",
-          "ios/helpers_ios.mm",
           "ios/objc/RTCAudioSession+Configuration.mm",
           "ios/objc/RTCAudioSession+Private.h",
           "ios/objc/RTCAudioSession.h",
diff --git a/webrtc/modules/audio_device/DEPS b/webrtc/modules/audio_device/DEPS
index 2f4a597051..d7f600cd93 100644
--- a/webrtc/modules/audio_device/DEPS
+++ b/webrtc/modules/audio_device/DEPS
@@ -8,4 +8,7 @@ specific_include_rules = {
   "ensure_initialized\.cc": [
     "+base/android",
   ],
+  "audio_device_ios\.mm": [
+    "+webrtc/sdk/objc",
+  ],
 }
diff --git a/webrtc/modules/audio_device/ios/audio_device_ios.mm b/webrtc/modules/audio_device/ios/audio_device_ios.mm
index bf6cac7d3c..cc164f29d1 100644
--- a/webrtc/modules/audio_device/ios/audio_device_ios.mm
+++ b/webrtc/modules/audio_device/ios/audio_device_ios.mm
@@ -25,7 +25,7 @@
 #include "webrtc/base/thread.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/audio_device/fine_audio_buffer.h"
-#include "webrtc/modules/audio_device/ios/helpers_ios.h"
+#include "webrtc/sdk/objc/Framework/Classes/helpers.h"
 
 #import "WebRTC/RTCLogging.h"
 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSession.h"
diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn
index 542296439f..279434b569 100644
--- a/webrtc/sdk/BUILD.gn
+++ b/webrtc/sdk/BUILD.gn
@@ -62,6 +62,8 @@ if (is_ios || is_mac) {
         "objc/Framework/Classes/RTCUIApplication.h",
         "objc/Framework/Classes/RTCUIApplication.mm",
         "objc/Framework/Classes/UIDevice+RTCDevice.mm",
+        "objc/Framework/Classes/helpers.h",
+        "objc/Framework/Classes/helpers.mm",
         "objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h",
         "objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h",
       ]
diff --git a/webrtc/modules/audio_device/ios/helpers_ios.h b/webrtc/sdk/objc/Framework/Classes/helpers.h
similarity index 92%
rename from webrtc/modules/audio_device/ios/helpers_ios.h
rename to webrtc/sdk/objc/Framework/Classes/helpers.h
index 6256046217..7802812c04 100644
--- a/webrtc/modules/audio_device/ios/helpers_ios.h
+++ b/webrtc/sdk/objc/Framework/Classes/helpers.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_DEVICE_IOS_HELPERS_IOS_H_
-#define WEBRTC_MODULES_AUDIO_DEVICE_IOS_HELPERS_IOS_H_
+#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_HELPERS_H_
+#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_HELPERS_H_
 
 #if defined(WEBRTC_IOS)
 
@@ -74,4 +74,4 @@ bool GetLowPowerModeEnabled();
 
 #endif  // defined(WEBRTC_IOS)
 
-#endif  // WEBRTC_MODULES_AUDIO_DEVICE_IOS_HELPERS_IOS_H_
+#endif  // WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_HELPERS_H_
diff --git a/webrtc/modules/audio_device/ios/helpers_ios.mm b/webrtc/sdk/objc/Framework/Classes/helpers.mm
similarity index 97%
rename from webrtc/modules/audio_device/ios/helpers_ios.mm
rename to webrtc/sdk/objc/Framework/Classes/helpers.mm
index 9a976c0384..3f04421a58 100644
--- a/webrtc/modules/audio_device/ios/helpers_ios.mm
+++ b/webrtc/sdk/objc/Framework/Classes/helpers.mm
@@ -19,7 +19,7 @@
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
-#include "webrtc/modules/audio_device/ios/helpers_ios.h"
+#include "webrtc/sdk/objc/Framework/Classes/helpers.h"
 
 namespace webrtc {
 namespace ios {
@@ -86,8 +86,6 @@ const char* LookUpRealName(const char* raw_name) {
   return "";
 }
 
-// TODO(henrika): move to shared location.
-// See https://code.google.com/p/webrtc/issues/detail?id=4773 for details.
 NSString* NSStringFromStdString(const std::string& stdString) {
   // std::string may contain null termination character so we construct
   // using length.