diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-30 21:25:05 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-30 21:25:05 +0000 |
| commit | a06734fd9ce32954f5eb5a290aed59dfb95e8a30 (patch) | |
| tree | 647ba9182302a18a040a5dac258ec479145c1726 /chrome/browser/extensions/extension_browsertests_misc.cc | |
| parent | 74681d3483621cf8081c6f42bb63b4cff8d349f3 (diff) | |
| download | chromium_src-a06734fd9ce32954f5eb5a290aed59dfb95e8a30.zip chromium_src-a06734fd9ce32954f5eb5a290aed59dfb95e8a30.tar.gz chromium_src-a06734fd9ce32954f5eb5a290aed59dfb95e8a30.tar.bz2 | |
Roll webkit 52633 -> 52667.
Rebaseline a bunch of SVG test broken to due webkit r52647.
BUG=25977,31028,29737,31350
TEST=mostly green layout test try runs.
Review URL: http://codereview.chromium.org/515067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_browsertests_misc.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_browsertests_misc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index 97ef316..ba2af3c 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -483,7 +483,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedInvalidFeed3) { } // Tests that message passing between extensions and tabs works. -IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MessagingExtensionTab) { +IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_MessagingExtensionTab) { ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("good").AppendASCII("Extensions") .AppendASCII("bjafgdebaacbbbecmhlhpofkepfkgcpa") @@ -542,7 +542,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, LastError) { } // Tests that message passing between extensions and content scripts works. -IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MessagingContentScript) { +IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_MessagingContentScript) { HTTPTestServer* server = StartHTTPServer(); ASSERT_TRUE(LoadExtension( |