Remove DeviceManager and DeviceInfo.

webrtc/media/media.gyp

Index: webrtc/media/media.gyp
diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp
index 2a5295734a056bc0acd333c39e94b34d5790e49f..71006969d1795a3f62cbd41d2c283cac33cf3ff2 100644
--- a/webrtc/media/media.gyp
+++ b/webrtc/media/media.gyp
@@ -76,7 +76,6 @@
         'base/videorenderer.h',
         'base/yuvframegenerator.cc',
         'base/yuvframegenerator.h',
-        'devices/deviceinfo.h',
         'devices/videorendererfactory.h',
         'engine/nullwebrtcvideoengine.h',
         'engine/simulcast.cc',
@@ -121,17 +120,6 @@
         4389,  # signed/unsigned mismatch.
       ],
       'conditions': [
-        ['include_internal_device_management==1', {
-          'sources': [
-            'devices/devicemanager.cc',
-            'devices/devicemanager.h',
-          ],
-        }, {
-          'sources': [
-            'devices/dummydevicemanager.cc',
-            'devices/dummydevicemanager.h',
-          ],
-        }],
         ['build_libyuv==1', {
           'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',],
         }],
@@ -170,9 +158,6 @@
           'sources': [
             'devices/libudevsymboltable.cc',

[kjellander_webrtc, 2016/03/01 20:56:37]

Does it make any sense to keep these few files around? Everything else for
include_internal_device_management==1 is dropped.

[the sun, 2016/03/01 21:14:59]

Right, as a matter of fact, I already have a CL lined up to remove them:
https://codereview.webrtc.org/1751583002/

Would you like me to do it (and remove the gyp flag) in this CL instead?

[kjellander_webrtc, 2016/03/01 21:31:29]

Ah, it doesn't matter to me, but it won't make this one harder to review so
including it here might make more sense.

             'devices/libudevsymboltable.h',
-            'devices/linuxdeviceinfo.cc',
-            'devices/linuxdevicemanager.cc',
-            'devices/linuxdevicemanager.h',
             'devices/v4llookup.cc',
             'devices/v4llookup.h',
           ],
@@ -207,38 +192,7 @@
             },
           },
         }],
-        ['OS=="win" and include_internal_device_management==1', {
-          'sources': [
-            'devices/win32deviceinfo.cc',
-            'devices/win32devicemanager.cc',
-            'devices/win32devicemanager.h',
-          ],
-          'msvs_settings': {
-            'VCLibrarianTool': {
-              'AdditionalDependencies': [
-                'winmm.lib',
-              ],
-            },
-          },
-        }],
         ['OS=="mac" and include_internal_device_management==1', {

[kjellander_webrtc, 2016/03/01 20:56:37]

If you're dropping all the device manager sources (depending on previous
comment), please also remove the variable from webrtc/build/common.gypi and all
the blocks in this GYP file.

[the sun, 2016/03/01 21:14:59]

See above comment.

-          'sources': [
-            'devices/macdeviceinfo.cc',
-            'devices/macdevicemanager.cc',
-            'devices/macdevicemanager.h',
-            'devices/macdevicemanagermm.mm',
-          ],
-          'xcode_settings': {
-            'WARNING_CFLAGS': [
-              # TODO(perkj): Update macdevicemanager.cc to stop using
-              # deprecated functions and remove this flag.
-              '-Wno-deprecated-declarations',
-            ],
-            # Disable partial availability warning to prevent errors
-            # in macdevicemanagermm.mm using AVFoundation.
-            # https://code.google.com/p/webrtc/issues/detail?id=4695
-            'WARNING_CFLAGS!': ['-Wpartial-availability'],
-          },
           'link_settings': {

[kjellander_webrtc, 2016/03/01 20:56:37]

These link_settings belonged only to the code you remove above, so they should
also be removed.

[the sun, 2016/03/01 21:14:59]

No, I get link errors elsewhere, but lazy me didn't figure out exactly why and
where, so I'll repent and do that.

[kjellander_webrtc, 2016/03/01 21:31:29]

Oh, you're probably right. I probably made that mistake in
https://codereview.webrtc.org/1693803002/ then. These things should have been
inside a condition with only OS=="mac" then.

             'xcode_settings': {
               'OTHER_LDFLAGS': [
@@ -265,36 +219,11 @@
             },
           },
         }],
-        ['OS=="ios" and include_internal_device_management==1', {
-          'sources': [
-            'devices/mobiledevicemanager.cc',
-          ],
-          'include_dirs': [
-            # TODO(sjlee) Remove when vp8 is building for iOS.  vp8 pulls in
-            # libjpeg which pulls in libyuv which currently disabled.
-            '../../third_party/libyuv/include',
-          ],
-          # TODO(kjellander): Make the code compile without disabling these.
-          # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
-          'cflags': [
-            '-Wno-unused-const-variable',
-          ],
-          'xcode_settings': {
-            'WARNING_CFLAGS': [
-              '-Wno-unused-const-variable',
-            ],
-          },
-        }],
         ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
           'defines': [
             'CARBON_DEPRECATED=YES',
           ],
         }],
-        ['OS=="android" and include_internal_device_management==1', {
-          'sources': [
-            'devices/mobiledevicemanager.cc',
-          ],
-        }],
       ],
     },  # target rtc_media
   ],  # targets.