diff options
| author | thestig <thestig@chromium.org> | 2015-10-29 14:29:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-29 21:30:43 +0000 |
| commit | ee796a1adcdc6da9d29400ed107c1d0cb3b59022 (patch) | |
| tree | da071bbd02fa05db5554f965d274a8cf106e3fe1 /extensions/BUILD.gn | |
| parent | 014fef2e684b37ff0b66ef8d3a8851b394667a46 (diff) | |
| download | chromium_src-ee796a1adcdc6da9d29400ed107c1d0cb3b59022.zip chromium_src-ee796a1adcdc6da9d29400ed107c1d0cb3b59022.tar.gz chromium_src-ee796a1adcdc6da9d29400ed107c1d0cb3b59022.tar.bz2 | |
webcamPrivate API: Fix regression from r351343. (try 2)
Additionally:
- Add unit test to test for this regression.
- Modify classes to support VISCA webcam unit tests.
- Modify VISCA webcam code to simplify code and to be more robust
against bad responses.
The previous try landed and broke ChromeOS GN.
See https://codereview.chromium.org/1412673007/
BUG=548043
TBR=rockot@chromium.org,xdai@chromium.org
Review URL: https://codereview.chromium.org/1408223006
Cr-Commit-Position: refs/heads/master@{#356955}
Diffstat (limited to 'extensions/BUILD.gn')
| -rw-r--r-- | extensions/BUILD.gn | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index eaed2b1..f84121f 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -201,7 +201,9 @@ test("extensions_unittests") { "//third_party/mojo/src/mojo/public/cpp/bindings", ] - data_deps = [ "//third_party/mesa:osmesa" ] + data_deps = [ + "//third_party/mesa:osmesa", + ] if (is_win) { deps += [ "//base/allocator" ] @@ -209,6 +211,8 @@ test("extensions_unittests") { if (is_chromeos) { sources += [ + "browser/api/webcam_private/visca_webcam_unittest.cc", + # TODO(rockot): There are two implementations of VpnServiceFactory, a # stub in app_shell and a real one in Chrome. This is wrong. "shell/browser/api/vpn_provider/vpn_service_factory.cc", @@ -265,7 +269,9 @@ test("extensions_browsertests") { "//third_party/mojo/src/mojo/public/cpp/bindings", ] - data_deps = [ "//third_party/mesa:osmesa" ] + data_deps = [ + "//third_party/mesa:osmesa", + ] if (is_win) { deps += [ "//base/allocator" ] |