Consolidate icon loading on ChromeOS

chrome/browser/download/download_extension_test.cc

 // Copyright (c) 2012 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.
 
 #include <algorithm>
 
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/download/download_extension_api.h"
@@ skipping 260 matching lines @@
       new DownloadsResumeFunction(), DownloadItemIdAsArgList(download_item));
   EXPECT_STREQ(download_extension_errors::kInvalidOperationError,
                error.c_str());
 
   // Calling pause()/resume()/cancel() with invalid download Ids is
   // tested in the API test (DownloadsApiTest).
 }
 
 // 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);
 
   // Get the icon for the in-progress download.  This call should succeed even
   // if the file type isn't registered.
   std::string args = base::StringPrintf("[%d, {}]", download_item->GetId());
   std::string result_string;
   EXPECT_TRUE(RunFunctionAndReturnString(new DownloadsGetFileIconFunction(),
                                          args, &result_string));
 
@@ skipping 78 matching lines @@
                error.c_str());
 
   // Asking for icons of other (invalid) sizes is tested in the API test
   // (DownloadsApiTest).
 }
 
 // Test that we can acquire file icons for history downloads regardless of
 // 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")));
   FilePath fake_path(
       downloads_directory().Append(FILE_PATH_LITERAL("fake.txt")));
   DownloadPersistentStoreInfo history_entries[] = {
     DownloadPersistentStoreInfo(
         real_path,
         GURL("http://does.not.exist/foo"),
         GURL(),
@@ skipping 48 matching lines @@
         new DownloadsGetFileIconFunction());
     function->SetIconExtractorForTesting(new MockIconExtractorImpl(
         (*iter)->GetFullPath(), IconLoader::NORMAL, "hello"));
     EXPECT_TRUE(RunFunctionAndReturnString(function.release(), args,
                                            &result_string));
     EXPECT_STREQ("hello", result_string.c_str());
   }
 
   // The temporary files should be cleaned up when the ScopedTempDir is removed.
 }