summaryrefslogtreecommitdiff
path: root/chromium/device
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-12-11 21:33:03 +0100
committerAndras Becsi <andras.becsi@digia.com>2013-12-13 12:34:07 +0100
commitf2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch)
tree0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/device
parent5362912cdb5eea702b68ebe23702468d17c3017a (diff)
downloadqtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/device')
-rw-r--r--chromium/device/device_tests.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/device/device_tests.gyp b/chromium/device/device_tests.gyp
index bdc387c211f..c9d29d44f17 100644
--- a/chromium/device/device_tests.gyp
+++ b/chromium/device/device_tests.gyp
@@ -11,6 +11,7 @@
'target_name': 'device_unittests',
'type': '<(gtest_target_type)',
'dependencies': [
+ '../base/base.gyp:run_all_unittests',
'../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
@@ -28,7 +29,6 @@
'bluetooth/bluetooth_service_record_win_unittest.cc',
'bluetooth/bluetooth_task_manager_win_unittest.cc',
'bluetooth/bluetooth_utils_unittest.cc',
- 'test/run_all_unittests.cc',
'usb/usb_ids_unittest.cc',
],
'conditions': [