| Index: chrome/browser/extensions/extension_override_apitest.cc
|
| diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc
|
| index 34253e2b0b7a67b5c46d0b366d171a33ea19cdce..d5eeed1c77f87b4d4c8cb7edb40764204bf9c4f3 100644
|
| --- a/chrome/browser/extensions/extension_override_apitest.cc
|
| +++ b/chrome/browser/extensions/extension_override_apitest.cc
|
| @@ -48,7 +48,7 @@ class ExtensionOverrideTest : public ExtensionApiTest {
|
| }
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideNewtab) {
|
| +IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideNewTab) {
|
| ASSERT_TRUE(RunExtensionTest("override/newtab")) << message_;
|
| {
|
| extensions::ResultCatcher catcher;
|
| @@ -69,11 +69,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideNewtab) {
|
|
|
| #if defined(OS_MACOSX)
|
| // Hangy: http://crbug.com/70511
|
| -#define MAYBE_OverrideNewtabIncognito DISABLED_OverrideNewtabIncognito
|
| +#define MAYBE_OverrideNewTabIncognito DISABLED_OverrideNewTabIncognito
|
| #else
|
| -#define MAYBE_OverrideNewtabIncognito OverrideNewtabIncognito
|
| +#define MAYBE_OverrideNewTabIncognito OverrideNewTabIncognito
|
| #endif
|
| -IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideNewtabIncognito) {
|
| +IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideNewTabIncognito) {
|
| ASSERT_TRUE(RunExtensionTest("override/newtab")) << message_;
|
|
|
| // Navigate an incognito tab to the new tab page. We should get the actual
|
|
|