| OLD | NEW | 
|   1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |   1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
|   2 // Use of this source code is governed by a BSD-style license that can be |   2 // Use of this source code is governed by a BSD-style license that can be | 
|   3 // found in the LICENSE file. |   3 // found in the LICENSE file. | 
|   4  |   4  | 
|   5 #include "chrome/browser/extensions/extension_apitest.h" |   5 #include "chrome/browser/extensions/extension_apitest.h" | 
|   6 #include "chrome/common/chrome_version_info.h" |   6 #include "chrome/common/chrome_version_info.h" | 
|   7 #include "chrome/common/extensions/feature_switch.h" |   7 #include "chrome/common/extensions/feature_switch.h" | 
|   8 #include "chrome/common/extensions/features/feature.h" |   8 #include "chrome/common/extensions/features/feature.h" | 
|   9 #include "content/public/common/content_switches.h" |   9 #include "content/public/common/content_switches.h" | 
|  10  |  10  | 
| (...skipping 11 matching lines...) Expand all  Loading... | 
|  22  |  22  | 
|  23 }  // namespace |  23 }  // namespace | 
|  24  |  24  | 
|  25 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, ApiTests) { |  25 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, ApiTests) { | 
|  26   extensions::FeatureSwitch::ScopedOverride tab_capture( |  26   extensions::FeatureSwitch::ScopedOverride tab_capture( | 
|  27       extensions::FeatureSwitch::tab_capture(), true); |  27       extensions::FeatureSwitch::tab_capture(), true); | 
|  28   ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental", |  28   ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental", | 
|  29                                   "api_tests.html")) << message_; |  29                                   "api_tests.html")) << message_; | 
|  30 } |  30 } | 
|  31  |  31  | 
|  32 #if defined(OS_WIN) |  32 #if defined(OS_WIN) || defined(OS_MACOSX) | 
|  33 // See http://crbug.com/174640 |  33 // See http://crbug.com/174640 | 
|  34 #define MAYBE_EndToEnd DISABLED_EndToEnd |  34 #define MAYBE_EndToEnd DISABLED_EndToEnd | 
|  35 #else |  35 #else | 
|  36 #define MAYBE_EndToEnd EndToEnd |  36 #define MAYBE_EndToEnd EndToEnd | 
|  37 #endif |  37 #endif | 
|  38  |  38  | 
|  39 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_EndToEnd) { |  39 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_EndToEnd) { | 
|  40   extensions::FeatureSwitch::ScopedOverride tab_capture( |  40   extensions::FeatureSwitch::ScopedOverride tab_capture( | 
|  41       extensions::FeatureSwitch::tab_capture(), true); |  41       extensions::FeatureSwitch::tab_capture(), true); | 
|  42   ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental", |  42   ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental", | 
|  43                                   "end_to_end.html")) << message_; |  43                                   "end_to_end.html")) << message_; | 
|  44 } |  44 } | 
|  45  |  45  | 
|  46 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, TabCapturePermissionsTestFlagOn) { |  46 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, TabCapturePermissionsTestFlagOn) { | 
|  47   extensions::FeatureSwitch::ScopedOverride tab_capture( |  47   extensions::FeatureSwitch::ScopedOverride tab_capture( | 
|  48       extensions::FeatureSwitch::tab_capture(), true); |  48       extensions::FeatureSwitch::tab_capture(), true); | 
|  49   ASSERT_TRUE(RunExtensionTest("tab_capture/permissions")) << message_; |  49   ASSERT_TRUE(RunExtensionTest("tab_capture/permissions")) << message_; | 
|  50 } |  50 } | 
|  51  |  51  | 
|  52 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, TabCapturePermissionsTestFlagOff) { |  52 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, TabCapturePermissionsTestFlagOff) { | 
|  53   extensions::FeatureSwitch::ScopedOverride tab_capture( |  53   extensions::FeatureSwitch::ScopedOverride tab_capture( | 
|  54       extensions::FeatureSwitch::tab_capture(), false); |  54       extensions::FeatureSwitch::tab_capture(), false); | 
|  55   ASSERT_TRUE(RunExtensionTest("tab_capture/permissions")) << message_; |  55   ASSERT_TRUE(RunExtensionTest("tab_capture/permissions")) << message_; | 
|  56 } |  56 } | 
|  57  |  57  | 
|  58 }  // namespace chrome |  58 }  // namespace chrome | 
| OLD | NEW |