| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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_switches.h" | 6 #include "chrome/common/chrome_switches.h" |
| 7 | 7 |
| 8 class ExperimentalApiTest : public ExtensionApiTest { | 8 class ExperimentalApiTest : public ExtensionApiTest { |
| 9 public: | 9 public: |
| 10 void SetUpCommandLine(CommandLine* command_line) { | 10 void SetUpCommandLine(CommandLine* command_line) { |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 } | 39 } |
| 40 | 40 |
| 41 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FavIconPermission) { | 41 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FavIconPermission) { |
| 42 ASSERT_TRUE(RunExtensionTest("permissions/favicon")) << message_; | 42 ASSERT_TRUE(RunExtensionTest("permissions/favicon")) << message_; |
| 43 } | 43 } |
| 44 | 44 |
| 45 // TODO(gregoryd): run the NaCl test on all systems once | 45 // TODO(gregoryd): run the NaCl test on all systems once |
| 46 // http://code.google.com/p/chromium/issues/detail?id=51335 is fixed. | 46 // http://code.google.com/p/chromium/issues/detail?id=51335 is fixed. |
| 47 // Meanwhile we run it on Mac OSX only, since we can be sure that an x86-32 NaCl | 47 // Meanwhile we run it on Mac OSX only, since we can be sure that an x86-32 NaCl |
| 48 // module will work there. | 48 // module will work there. |
| 49 // Mark as Flaky. http://crbug.com/51861 |
| 49 #if defined(OS_MACOSX) | 50 #if defined(OS_MACOSX) |
| 50 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NaClPermissionEnabled) { | 51 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_NaClPermissionEnabled) { |
| 51 ASSERT_TRUE(RunExtensionTest("permissions/nacl_enabled")) << message_; | 52 ASSERT_TRUE(RunExtensionTest("permissions/nacl_enabled")) << message_; |
| 52 } | 53 } |
| 53 #endif | 54 #endif |
| OLD | NEW |