diff options
author | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 07:51:17 +0000 |
---|---|---|
committer | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 07:51:17 +0000 |
commit | 7e56f9aceccf762450c22324336035d60ebe07e4 (patch) | |
tree | bfbde2225500b53e5f269426c1dd6545d8c79a73 /chrome/browser/extensions/extension_incognito_apitest.cc | |
parent | c32d31eab915dcff1f128bf744ced2ad8fa221ef (diff) | |
download | chromium_src-7e56f9aceccf762450c22324336035d60ebe07e4.zip chromium_src-7e56f9aceccf762450c22324336035d60ebe07e4.tar.gz chromium_src-7e56f9aceccf762450c22324336035d60ebe07e4.tar.bz2 |
Reverts r65780.
Now fix for OpaqueBrowserFrameView NULL pointer access is in,
we can remove FLAKY prefix for ExtensionAPITest.Incognito.
BUG=chromium-os:9049
TEST=run browser_test --gtest_filter="ExtensionAPITest.Incognito" for chromiumos_linux and other targets.
Review URL: http://codereview.chromium.org/5151002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_incognito_apitest.cc')
-rw-r--r-- | chrome/browser/extensions/extension_incognito_apitest.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/extensions/extension_incognito_apitest.cc b/chrome/browser/extensions/extension_incognito_apitest.cc index f4824ec..52ee7c3 100644 --- a/chrome/browser/extensions/extension_incognito_apitest.cc +++ b/chrome/browser/extensions/extension_incognito_apitest.cc @@ -91,16 +91,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DontCreateIncognitoProfile) { ASSERT_FALSE(browser()->profile()->HasOffTheRecordProfile()); } -// TODO(kochi): Flaky at r65757 and after on buildbot for ChromiumOS. -// http://crosbug.com/9049 -#if defined(OS_CHROMEOS) -#define MAYBE_Incognito FLAKY_Incognito -#else -#define MAYBE_Incognito Incognito -#endif - // Tests that the APIs in an incognito-enabled extension work properly. -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Incognito) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Incognito) { host_resolver()->AddRule("*", "127.0.0.1"); ASSERT_TRUE(StartTestServer()); |