Consolidate icon loading on ChromeOS.

BUG=110919, 109677
TEST=unit_tests --gtest_filter=FileIconSourceTest.* && browser_tests --gtest_filter=DownloadExtensionTest.DownloadsApi_FileIcon_*


Review URL: http://codereview.chromium.org/9167019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119935 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 18 deletions

diff --git a/chrome/browser/download/download_extension_test.cc b/chrome/browser/download/download_extension_test.cc
index 6060520..70a37b6 100644
--- a/chrome/browser/download/download_extension_test.cc
+++ b/chrome/browser/download/download_extension_test.cc
@@ -332,15 +332,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadsApi_PauseResumeCancel) {
 
 // Test downloads.getFileIcon() on in-progress, finished, cancelled and deleted
 // download items.
-// TODO(asanka): Fails on ChromeOS (http://crbug.com/109677)
-#if defined(OS_CHROMEOS)
-#define MAYBE_DownloadsApi_FileIcon_Active \
-        FAILS_DownloadsApi_FileIcon_Active
-#else
-#define MAYBE_DownloadsApi_FileIcon_Active DownloadsApi_FileIcon_Active
-#endif
-IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
-                       MAYBE_DownloadsApi_FileIcon_Active) {
+IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadsApi_FileIcon_Active) {
   DownloadItem* download_item = CreateSlowTestDownload();
   ASSERT_TRUE(download_item);
 
@@ -439,15 +431,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
 // 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.
-// TODO(asanka): Fails on ChromeOS (http://crbug.com/109677)
-#if defined(OS_CHROMEOS)
-#define MAYBE_DownloadsApi_FileIcon_History \
-        FAILS_DownloadsApi_FileIcon_History
-#else
-#define MAYBE_DownloadsApi_FileIcon_History DownloadsApi_FileIcon_History
-#endif
-IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
-                       MAYBE_DownloadsApi_FileIcon_History) {
+IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadsApi_FileIcon_History) {
   base::Time current(base::Time::Now());
   FilePath real_path(
       downloads_directory().Append(FILE_PATH_LITERAL("real.txt")));