Unify the macOS and iOS capturer implementations

webrtc/modules/video_capture/apple/device_info.h

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_IOS_DEVICE_INFO_IOS_H_
-#define WEBRTC_MODULES_VIDEO_CAPTURE_IOS_DEVICE_INFO_IOS_H_
+#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_APPLE_DEVICE_INFO_H_

[tkchin_webrtc, 2016/09/27 10:56:04]

ditto OBJC. Here and rest of CL

+#define WEBRTC_MODULES_VIDEO_CAPTURE_APPLE_DEVICE_INFO_H_
 
 #include "webrtc/modules/video_capture/device_info_impl.h"
 
 #include <map>
+#include <string>
 
 namespace webrtc {
 namespace videocapturemodule {
 class DeviceInfoIos : public DeviceInfoImpl {
  public:
   explicit DeviceInfoIos(const int32_t device_id);
   virtual ~DeviceInfoIos();
 
   // Implementation of DeviceInfoImpl.
   int32_t Init() override;
@@ skipping 23 matching lines @@
 
   int32_t CreateCapabilityMap(const char* device_unique_id_utf8) override;
 
  private:
   std::map<std::string, VideoCaptureCapabilities> _capabilitiesMap;
 };
 
 }  // namespace videocapturemodule
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_VIDEO_CAPTURE_IOS_DEVICE_INFO_IOS_H_
+#endif  // WEBRTC_MODULES_VIDEO_CAPTURE_APPLE_DEVICE_INFO_H_