Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / tab_capture / tab_capture_apitest.cc

diff --git a/src/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc b/src/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
index 3714c2b..367dc26 100644 (file)
--- a/src/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
+++ b/src/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
@@ -41,7 +41,7 @@ class TabCaptureApiTest : public ExtensionApiTest {
 
 class TabCaptureApiPixelTest : public TabCaptureApiTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     EnablePixelOutput();
     TabCaptureApiTest::SetUp();
   }
@@ -80,12 +80,8 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, ApiTestsAudio) {
 
 // Disabled on ChromeOS for http://crbug.com/406051
 // Disabled on other platforms for http://crbug.com/177163
-#if !defined(NDEBUG) || defined(OS_CHROMEOS)
-#define MAYBE_EndToEnd DISABLED_EndToEnd
-#else
-#define MAYBE_EndToEnd EndToEnd
-#endif
-IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, MAYBE_EndToEnd) {
+// Disabled http://crbug.com/367349
+IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, DISABLED_EndToEnd) {
 #if defined(OS_WIN)
   // TODO(justinlin): Disabled for WinXP due to timeout issues.
   if (base::win::GetVersion() < base::win::VERSION_VISTA) {