summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-06 21:11:18 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-06 21:11:18 +0000
commit0a2e866291784e0009575ec387d5d3d022aa2530 (patch)
tree6a9cc82e3e152fbb956a7e6be0a1a03bc2f1fa51 /chrome/browser/extensions
parent88562b513b492a3a3cf92515097fd2de31a2d6f6 (diff)
downloadchromium_src-0a2e866291784e0009575ec387d5d3d022aa2530.zip
chromium_src-0a2e866291784e0009575ec387d5d3d022aa2530.tar.gz
chromium_src-0a2e866291784e0009575ec387d5d3d022aa2530.tar.bz2
Data type conversion between extensions API and Cast API
Converts to and from Cast API types. Also fixed a couple issues to match the API between Cast and Extensions API. Cast Extensions API is now fully redirected to Cast native APIs. Minus the conversion of MediaStreamTrack. BUG=301920 Review URL: https://codereview.chromium.org/47343005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/webrtc_cast_apitest.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/extensions/webrtc_cast_apitest.cc b/chrome/browser/extensions/webrtc_cast_apitest.cc
index d551fe0..9bd7829 100644
--- a/chrome/browser/extensions/webrtc_cast_apitest.cc
+++ b/chrome/browser/extensions/webrtc_cast_apitest.cc
@@ -2,12 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/command_line.h"
#include "chrome/browser/extensions/extension_apitest.h"
+#include "chrome/common/chrome_switches.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace extensions {
class WebrtcCastApiTest : public ExtensionApiTest {
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ ExtensionApiTest::SetUpCommandLine(command_line);
+ command_line->AppendSwitchASCII(
+ switches::kWhitelistedExtensionID,
+ "ddchlicdkolnonkihahngkmmmjnjlkkf");
+ }
};
// Test running the test extension for Cast Mirroring API.