Unify the macOS and iOS capturer implementations

webrtc/modules/video_capture/objc/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_OBJC_DEVICE_INFO_H_
+#define WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_H_
 
 #include "webrtc/modules/video_capture/device_info_impl.h"
 
 #include <map>
+#include <string>
 
 namespace webrtc {
 namespace videocapturemodule {
 class DeviceInfoIos : public DeviceInfoImpl {

[tkchin_webrtc, 2016/09/28 09:21:06]

typically file name = class name
not as familiar with C++ style rules though

[kthelgason, 2016/09/28 11:01:43]

I can't find any specific mention of this in the style guide. I agree with you,
but since this stuff will hopefully all be deleted in the near future I don't
think it's worth it to go through and change this everywhere.

  public:
   explicit DeviceInfoIos(const int32_t device_id);
   virtual ~DeviceInfoIos();
 
   // Implementation of DeviceInfoImpl.
   int32_t Init() override;
   uint32_t NumberOfDevices() override;
   int32_t GetDeviceName(uint32_t deviceNumber,
                         char* deviceNameUTF8,
                         uint32_t deviceNameLength,
@@ skipping 19 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_OBJC_DEVICE_INFO_H_