diff options
| -rw-r--r-- | chrome/browser/download/download_extension_test.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/extensions/active_tab_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/api/tabs/tabs_test.cc | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/download/download_extension_test.cc b/chrome/browser/download/download_extension_test.cc index fb6ca46..57d77e3 100644 --- a/chrome/browser/download/download_extension_test.cc +++ b/chrome/browser/download/download_extension_test.cc @@ -436,7 +436,8 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadsApi_PauseResumeCancel) { // Test downloads.getFileIcon() on in-progress, finished, cancelled and deleted // download items. -IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadsApi_FileIcon_Active) { +IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, + DISABLED_DownloadsApi_FileIcon_Active) { DownloadItem* download_item = CreateSlowTestDownload(); ASSERT_TRUE(download_item); @@ -535,7 +536,8 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadsApi_FileIcon_Active) { // whether they exist or not. If the file doesn't exist we should receive a // generic icon from the OS/toolkit that may or may not be specific to the file // type. -IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadsApi_FileIcon_History) { +IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, + DISABLED_DownloadsApi_FileIcon_History) { const HistoryDownloadInfo kHistoryInfo[] = { { FILE_PATH_LITERAL("real.txt"), DownloadItem::COMPLETE, @@ -820,7 +822,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadsApi_SearchPlural) { } IN_PROC_BROWSER_TEST_F(DownloadExtensionTestIncognito, - DownloadsApi_SearchIncognito) { + DISABLED_DownloadsApi_SearchIncognito) { scoped_ptr<base::Value> result_value; base::ListValue* result_list = NULL; base::DictionaryValue* result_dict = NULL; diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc index c1c00e9..4f75e7d 100644 --- a/chrome/browser/extensions/active_tab_unittest.cc +++ b/chrome/browser/extensions/active_tab_unittest.cc @@ -127,7 +127,7 @@ class ActiveTabTest : public TabContentsTestHarness { content::TestBrowserThread ui_thread_; }; -TEST_F(ActiveTabTest, GrantToSinglePage) { +TEST_F(ActiveTabTest, DISABLED_GrantToSinglePage) { GURL google("http://www.google.com"); NavigateAndCommit(google); diff --git a/chrome/browser/extensions/api/tabs/tabs_test.cc b/chrome/browser/extensions/api/tabs/tabs_test.cc index 02644f0..2de2db8 100644 --- a/chrome/browser/extensions/api/tabs/tabs_test.cc +++ b/chrome/browser/extensions/api/tabs/tabs_test.cc @@ -428,7 +428,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, QueryCurrentWindowTabs) { } } -IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, QueryLastFocusedWindowTabs) { +IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DISABLED_QueryLastFocusedWindowTabs) { const size_t kExtraWindows = 2; for (size_t i = 0; i < kExtraWindows; ++i) CreateBrowser(browser()->profile()); |