From a692d1340352d1ed6a8612fe2ad125be300c278a Mon Sep 17 00:00:00 2001 From: "justinlin@chromium.org" Date: Wed, 31 Oct 2012 05:15:25 +0000 Subject: Enable TabCapture API on Windows (now that r164957 has landed) and ChromeOS. BUG= Review URL: https://chromiumcodereview.appspot.com/11342052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165101 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/about_flags.cc | 2 +- chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 14edcce..0b6b4fc 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -764,7 +764,7 @@ const Experiment kExperiments[] = { "enable-tab-capture", IDS_ENABLE_TAB_CAPTURE_NAME, IDS_ENABLE_TAB_CAPTURE_DESCRIPTION, - kOsMac | kOsLinux, + kOsWin | kOsMac | kOsLinux | kOsCrOS, MULTI_VALUE_TYPE(kTabCaptureChoices) }, #if defined(OS_CHROMEOS) diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc index 105b6ea..98b4731 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc @@ -22,12 +22,7 @@ class TabCaptureApiTest : public ExtensionApiTest { } // namespace -#if defined(OS_WIN) -#define MAYBE_TabCapture DISABLED_TabCapture -#else -#define MAYBE_TabCapture TabCapture -#endif // defined (OS_WIN) -IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_TabCapture) { +IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, TabCapture) { extensions::FeatureSwitch::ScopedOverride tab_capture( extensions::FeatureSwitch::tab_capture(), true); ASSERT_TRUE(RunExtensionTest("tab_capture/experimental")) << message_; -- cgit v1.1