| Index: extensions/browser/guest_view/extension_options/extension_options_apitest.cc
|
| diff --git a/extensions/browser/guest_view/extension_options/extension_options_apitest.cc b/extensions/browser/guest_view/extension_options/extension_options_apitest.cc
|
| index af98ead1b454a358d2dbb17f1aeb99ecbc2bbc19..46d9b3aebc611d38e85f6fa1b2d36a80e4a085a1 100644
|
| --- a/extensions/browser/guest_view/extension_options/extension_options_apitest.cc
|
| +++ b/extensions/browser/guest_view/extension_options/extension_options_apitest.cc
|
| @@ -30,7 +30,14 @@ class ExtensionOptionsApiTest : public ExtensionApiTest {
|
| scoped_ptr<FeatureSwitch::ScopedOverride> enable_options_;
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(ExtensionOptionsApiTest, ExtensionCanEmbedOwnOptions) {
|
| +// crbug/415949.
|
| +#if defined(OS_MACOSX)
|
| +#define MAYBE_ExtensionCanEmbedOwnOptions DISABLED_ExtensionCanEmbedOwnOptions
|
| +#else
|
| +#define MAYBE_ExtensionCanEmbedOwnOptions ExtensionCanEmbedOwnOptions
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(ExtensionOptionsApiTest,
|
| + MAYBE_ExtensionCanEmbedOwnOptions) {
|
| base::FilePath extension_dir =
|
| test_data_dir_.AppendASCII("extension_options").AppendASCII("embed_self");
|
| ASSERT_TRUE(LoadExtension(extension_dir));
|
|
|