content/content_shell.gypi - Issue 1132943002: bluetooth: Move mock creation out of BluetoothDispatcherHost to LayoutTestBluetoothAdapterProvider.

Unified Diff: content/content_shell.gypi

Issue 1132943002: bluetooth: Move mock creation out of BluetoothDispatcherHost to LayoutTestBluetoothAdapterProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-testing-layout-tests

Patch Set: Address scheib comments Created 5 years, 7 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

« no previous file with comments | « content/browser/bluetooth/bluetooth_dispatcher_host.cc ('k') | content/shell/BUILD.gn » ('j') | content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_shell.gypi

diff --git a/content/content_shell.gypi b/content/content_shell.gypi

index 8429d9b46fe20b0c37a61f1ef1dd5f5c2438ae59..404f08d8b96c22ddc815bfeeb8330f13791f99ed 100644

--- a/content/content_shell.gypi

+++ b/content/content_shell.gypi

@@ -51,6 +51,7 @@

'../components/components.gyp:devtools_http_handler',

'../components/components.gyp:web_cache_renderer',

'../device/bluetooth/bluetooth.gyp:device_bluetooth',

+ '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',

Jeffrey Yasskin 2015/05/12 22:17:53 Call these "fakes" or "stubs" unless they're actua

ortuno 2015/05/13 17:14:49 We don't have any control over those. They were wr

'../gin/gin.gyp:gin',

'../gpu/gpu.gyp:gpu',

'../ipc/ipc.gyp:ipc',

@@ -63,6 +64,8 @@

'../third_party/WebKit/public/blink.gyp:blink',

'../third_party/WebKit/public/blink.gyp:blink_test_support',

'../ui/base/ime/ui_base_ime.gyp:ui_base_ime',

+ '../testing/gmock.gyp:gmock',

Jeffrey Yasskin 2015/05/12 22:17:53 I'm worried about including gtest & gmock in a non

ortuno 2015/05/13 17:14:49 We talked to @jam and he was OK with this.

Jeffrey Yasskin 2015/05/13 19:40:50 Sounds good. That also deals with your worry that

+ '../testing/gtest.gyp:gtest',

'../ui/base/ui_base.gyp:ui_base',

'../ui/events/events.gyp:events_base',

'../ui/gfx/gfx.gyp:gfx',

@@ -100,6 +103,8 @@

'shell/browser/ipc_echo_message_filter.h',

'shell/browser/layout_test/layout_test_android.cc',

'shell/browser/layout_test/layout_test_android.h',

+ 'shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h',

+ 'shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc',

'shell/browser/layout_test/layout_test_browser_context.cc',

'shell/browser/layout_test/layout_test_browser_context.h',

'shell/browser/layout_test/layout_test_browser_main.cc',