| Index: chrome/chrome_tests.gypi | 
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi | 
| index 4433ec474a7a97cb20a0739401181cf2fd454bce..3df5504685c868a052658e881899e30e59c6c8f1 100644 | 
| --- a/chrome/chrome_tests.gypi | 
| +++ b/chrome/chrome_tests.gypi | 
| @@ -394,6 +394,8 @@ | 
| '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.h', | 
| '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.cc', | 
| '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.h', | 
| +        '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/mobile_devices.cc', | 
| +        '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/mobile_devices.h', | 
| 'test/chromedriver/chrome/adb.h', | 
| 'test/chromedriver/chrome/adb_impl.cc', | 
| 'test/chromedriver/chrome/adb_impl.h', | 
| @@ -417,6 +419,8 @@ | 
| 'test/chromedriver/chrome/debugger_tracker.h', | 
| 'test/chromedriver/chrome/device_manager.cc', | 
| 'test/chromedriver/chrome/device_manager.h', | 
| +        'test/chromedriver/chrome/device_metrics.cc', | 
| +        'test/chromedriver/chrome/device_metrics.h', | 
| 'test/chromedriver/chrome/devtools_client.h', | 
| 'test/chromedriver/chrome/devtools_client_impl.cc', | 
| 'test/chromedriver/chrome/devtools_client_impl.h', | 
| @@ -437,6 +441,8 @@ | 
| 'test/chromedriver/chrome/javascript_dialog_manager.h', | 
| 'test/chromedriver/chrome/log.h', | 
| 'test/chromedriver/chrome/log.cc', | 
| +        'test/chromedriver/chrome/mobile_emulation_override_manager.cc', | 
| +        'test/chromedriver/chrome/mobile_emulation_override_manager.h', | 
| 'test/chromedriver/chrome/navigation_tracker.cc', | 
| 'test/chromedriver/chrome/navigation_tracker.h', | 
| 'test/chromedriver/chrome/performance_logger.h', | 
| @@ -452,6 +458,8 @@ | 
| 'test/chromedriver/chrome/web_view.h', | 
| 'test/chromedriver/chrome/web_view_impl.cc', | 
| 'test/chromedriver/chrome/web_view_impl.h', | 
| +        'test/chromedriver/mobile_device.cc', | 
| +        'test/chromedriver/mobile_device.h', | 
| 'test/chromedriver/net/adb_client_socket.cc', | 
| 'test/chromedriver/net/adb_client_socket.h', | 
| 'test/chromedriver/net/net_util.cc', | 
| @@ -542,6 +550,25 @@ | 
| ], | 
| 'message': 'Generating sources for embedding automation extension', | 
| }, | 
| +        { | 
| +          'action_name': 'embed_mobile_devices_in_cpp', | 
| +          'inputs': [ | 
| +            'test/chromedriver/cpp_source.py', | 
| +            'test/chromedriver/embed_mobile_devices_in_cpp.py', | 
| +            '../third_party/WebKit/Source/devtools/front_end/elements/OverridesView.js', | 
| +          ], | 
| +          'outputs': [ | 
| +            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/mobile_devices.cc', | 
| +            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/mobile_devices.h', | 
| +          ], | 
| +          'action': [ 'python', | 
| +                      'test/chromedriver/embed_mobile_devices_in_cpp.py', | 
| +                      '--directory', | 
| +                      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome', | 
| +                      '../third_party/WebKit/Source/devtools/front_end/elements/OverridesView.js', | 
| +          ], | 
| +          'message': 'Generating sources for embedding mobile devices in chromedriver', | 
| +        }, | 
| ], | 
| # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 
| 'msvs_disabled_warnings': [ 4267, ], | 
| @@ -691,6 +718,7 @@ | 
| 'test/chromedriver/chrome/geolocation_override_manager_unittest.cc', | 
| 'test/chromedriver/chrome/heap_snapshot_taker_unittest.cc', | 
| 'test/chromedriver/chrome/javascript_dialog_manager_unittest.cc', | 
| +        'test/chromedriver/chrome/mobile_emulation_override_manager_unittest.cc', | 
| 'test/chromedriver/chrome/navigation_tracker_unittest.cc', | 
| 'test/chromedriver/chrome/performance_logger_unittest.cc', | 
| 'test/chromedriver/chrome/status_unittest.cc', | 
|  |