chrome/chrome_tests.gypi - Issue 11075006: Moved bluetooth adapter files to device/bluetooth/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_tests.gypi

Issue 11075006: Moved bluetooth adapter files to device/bluetooth/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove ChromeOs dependency from bluetooth_api.* as much as possible. Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/chrome_tests.gypi

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi

index 5a70d3a21e5ebc3c0e2b2edfbee02725bbfdb824..a19e5c799e1c7cdb58af2fb56c4a4979fa216d9e 100644

--- a/chrome/chrome_tests.gypi

+++ b/chrome/chrome_tests.gypi

@@ -1091,12 +1091,6 @@

'browser/chrome_browser_application_mac_unittest.mm',

'browser/chrome_browser_main_unittest.cc',

'browser/chrome_page_zoom_unittest.cc',

- 'browser/chromeos/bluetooth/bluetooth_service_record_unittest.cc',

- 'browser/chromeos/bluetooth/bluetooth_utils_unittest.cc',

- 'browser/chromeos/bluetooth/bluetooth_adapter_chromeos_unittest.cc',

- 'browser/chromeos/bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc',

- 'browser/chromeos/bluetooth/test/mock_bluetooth_adapter.cc',

- 'browser/chromeos/bluetooth/test/mock_bluetooth_adapter.h',

'browser/chromeos/contacts/contact_database_unittest.cc',

'browser/chromeos/contacts/contact_manager_stub.cc',

'browser/chromeos/contacts/contact_manager_stub.h',

@@ -2711,6 +2705,8 @@

'../base/base.gyp:base',

'../base/base.gyp:base_i18n',

'../base/base.gyp:test_support_base',

+ '../device/device.gyp:bluetooth_out_of_band_pairing_data',

+ '../device/device.gyp:mock_bluetooth',

'../net/net.gyp:net',

'../net/net.gyp:net_test_support',

'../skia/skia.gyp:skia',

@@ -2761,10 +2757,6 @@

'browser/chrome_main_browsertest.cc',

'browser/chrome_plugin_browsertest.cc',

'browser/chrome_switches_browsertest.cc',

- 'browser/chromeos/bluetooth/test/mock_bluetooth_adapter.cc',

- 'browser/chromeos/bluetooth/test/mock_bluetooth_adapter.h',

- 'browser/chromeos/bluetooth/test/mock_bluetooth_device.cc',

- 'browser/chromeos/bluetooth/test/mock_bluetooth_device.h',

'browser/chromeos/contacts/contact_test_util.cc',

'browser/chromeos/cros/cros_in_process_browser_test.cc',

'browser/chromeos/cros/cros_in_process_browser_test.h',

« chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('K') | « chrome/chrome_browser_ui.gypi ('k') | chromeos/chromeos.gyp » ('j') | no next file with comments »