diff options
| -rw-r--r-- | chrome/browser/extensions/browser_action_apitest.cc | 16 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_incognito_apitest.cc | 9 |
2 files changed, 4 insertions, 21 deletions
diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc index e52aecb..63d205b 100644 --- a/chrome/browser/extensions/browser_action_apitest.cc +++ b/chrome/browser/extensions/browser_action_apitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -24,16 +24,6 @@ #include "gfx/rect.h" #include "gfx/size.h" -#if defined(OS_MACOSX) -// http://crbug.com/40002 -#define MAYBE_IncognitoBasic DISABLED_IncognitoBasic -// http://crbug.com/40133 -#define MAYBE_BrowserActionAddPopup DISABLED_BrowserActionAddPopup -#else -#define MAYBE_IncognitoBasic IncognitoBasic -#define MAYBE_BrowserActionAddPopup BrowserActionAddPopup -#endif - class BrowserActionApiTest : public ExtensionApiTest { public: BrowserActionApiTest() {} @@ -188,7 +178,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionPopup) { // Test that calling chrome.browserAction.setPopup() can enable and change // a popup. -IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, MAYBE_BrowserActionAddPopup) { +IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionAddPopup) { ASSERT_TRUE(RunExtensionTest("browser_action/add_popup")) << message_; Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; @@ -275,7 +265,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionRemovePopup) { << "a specific tab id."; } -IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, MAYBE_IncognitoBasic) { +IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, IncognitoBasic) { ASSERT_TRUE(StartHTTPServer()); ASSERT_TRUE(RunExtensionTest("browser_action/basics")) << message_; diff --git a/chrome/browser/extensions/extension_incognito_apitest.cc b/chrome/browser/extensions/extension_incognito_apitest.cc index 15649ff..a996bcc 100644 --- a/chrome/browser/extensions/extension_incognito_apitest.cc +++ b/chrome/browser/extensions/extension_incognito_apitest.cc @@ -16,13 +16,6 @@ #include "chrome/test/ui_test_utils.h" #include "net/base/mock_host_resolver.h" -// http://crbug.com/40002 -#if defined(OS_MACOSX) -#define MAYBE_IncognitoPopup DISABLED_IncognitoPopup -#else -#define MAYBE_IncognitoPopup IncognitoPopup -#endif - IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, IncognitoNoScript) { host_resolver()->AddRule("*", "127.0.0.1"); ASSERT_TRUE(StartHTTPServer()); @@ -122,7 +115,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabled) { } // Test that opening a popup from an incognito browser window works properly. -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_IncognitoPopup) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoPopup) { host_resolver()->AddRule("*", "127.0.0.1"); ASSERT_TRUE(StartHTTPServer()); |