| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
| 7 #include "chrome/common/chrome_switches.h" | 7 #include "chrome/common/chrome_switches.h" |
| 8 #include "content/public/common/content_switches.h" | 8 #include "content/public/common/content_switches.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 | 10 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 // unneeded. | 28 // unneeded. |
| 29 // crbug.com/313128 | 29 // crbug.com/313128 |
| 30 #if !defined(OS_CHROMEOS) | 30 #if !defined(OS_CHROMEOS) |
| 31 UseRealGLContexts(); | 31 UseRealGLContexts(); |
| 32 #endif | 32 #endif |
| 33 | 33 |
| 34 ExtensionApiTest::SetUp(); | 34 ExtensionApiTest::SetUp(); |
| 35 } | 35 } |
| 36 }; | 36 }; |
| 37 | 37 |
| 38 // Disabled on OSX due to http://crbug.com/332427 |
| 39 #if defined(OS_MACOSX) |
| 40 #define MAYBE_Basics DISABLED_Basics |
| 41 #else |
| 42 #define MAYBE_Basics Basics |
| 43 #endif |
| 44 |
| 38 // Test running the test extension for Cast Mirroring API. | 45 // Test running the test extension for Cast Mirroring API. |
| 39 IN_PROC_BROWSER_TEST_F(CastStreamingApiTest, Basics) { | 46 IN_PROC_BROWSER_TEST_F(CastStreamingApiTest, MAYBE_Basics) { |
| 40 ASSERT_TRUE(RunExtensionSubtest("cast_streaming", "basics.html")); | 47 ASSERT_TRUE(RunExtensionSubtest("cast_streaming", "basics.html")); |
| 41 } | 48 } |
| 42 | 49 |
| 43 } // namespace extensions | 50 } // namespace extensions |
| OLD | NEW |