Replace all usage of TestImageDecoder by usage of FakeImageDecoder

The latter turns out to Just Work when used instead of the former
throughout the codebase.

This simplification fell out of the elimination of
FakeAccountFetcherService, which had left TestImageDecoder hanging
behind.

TBR=droger@chromium.org

Bug: 935998
Change-Id: I6114039aac0f0343a595c38f28a20bab9463e86e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1505936
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638949}

chrome/browser/signin/identity_test_environment_profile_adaptor.cc

@@ -13,7 +13,6 @@
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
-#include "components/signin/core/browser/test_image_decoder.h"
 
 namespace {
 

components/signin/core/browser/BUILD.gn

@@ -220,8 +220,6 @@ static_library("internals_test_support") {
   sources = [
     "fake_profile_oauth2_token_service.cc",
     "fake_profile_oauth2_token_service.h",
-    "test_image_decoder.cc",
-    "test_image_decoder.h",
 
     # TODO(https://crbug.com/907782): Move list_accounts_test_utils to
     # //services/identity/public/cpp once FakeGCMS no longer depends on it.
@@ -233,10 +231,8 @@ static_library("internals_test_support") {
 
   deps = [
     "//base/test:test_support",
-    "//components/image_fetcher/core",
     "//components/prefs",
     "//google_apis:test_support",
-    "//ui/gfx:test_support",
   ]
 
   public_deps = [

components/signin/core/browser/account_tracker_service_unittest.cc

@@ -13,6 +13,7 @@
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/scoped_task_environment.h"
 #include "build/build_config.h"
+#include "components/image_fetcher/core/fake_image_decoder.h"
 #include "components/image_fetcher/core/image_data_fetcher.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/scoped_user_pref_update.h"
@@ -22,7 +23,6 @@
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/avatar_icon_util.h"
 #include "components/signin/core/browser/signin_pref_names.h"
-#include "components/signin/core/browser/test_image_decoder.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "google_apis/gaia/fake_oauth2_token_service.h"
 #include "google_apis/gaia/gaia_oauth_client.h"
@@ -356,9 +356,9 @@ class AccountTrackerServiceTest : public testing::Test {
     account_tracker_->AddObserver(&observer_);
 
     account_tracker_->Initialize(&pref_service_, std::move(path));
-    account_fetcher_->Initialize(signin_client(), token_service(),
-                                 account_tracker_.get(),
-                                 std::make_unique<TestImageDecoder>());
+    account_fetcher_->Initialize(
+        signin_client(), token_service(), account_tracker_.get(),
+        std::make_unique<image_fetcher::FakeImageDecoder>());
     if (network_enabled) {
       account_fetcher_->EnableNetworkFetchesForTest();
     }

components/signin/core/browser/signin_manager_unittest.cc

@@ -14,17 +14,18 @@
 #include "base/run_loop.h"
 #include "base/test/scoped_task_environment.h"
 #include "build/build_config.h"
+#include "components/image_fetcher/core/fake_image_decoder.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/signin/core/browser/account_consistency_method.h"
+#include "components/signin/core/browser/account_fetcher_service.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/device_id_helper.h"
 #include "components/signin/core/browser/gaia_cookie_manager_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_pref_names.h"
-#include "components/signin/core/browser/test_image_decoder.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "google_apis/gaia/fake_oauth2_token_service_delegate.h"
@@ -79,9 +80,9 @@ class SigninManagerTest : public testing::Test {
     SigninManagerBase::RegisterProfilePrefs(user_prefs_.registry());
     SigninManagerBase::RegisterPrefs(local_state_.registry());
     account_tracker_.Initialize(&user_prefs_, base::FilePath());
-    account_fetcher_.Initialize(&test_signin_client_, &token_service_,
-                                &account_tracker_,
-                                std::make_unique<TestImageDecoder>());
+    account_fetcher_.Initialize(
+        &test_signin_client_, &token_service_, &account_tracker_,
+        std::make_unique<image_fetcher::FakeImageDecoder>());
   }
 
   ~SigninManagerTest() override {

ios/chrome/browser/signin/BUILD.gn

@@ -123,6 +123,7 @@ source_set("test_support") {
   deps = [
     ":signin",
     "//base",
+    "//components/image_fetcher/core:test_support",
     "//components/keyed_service/core",
     "//components/signin/core/browser:internals_test_support",
     "//components/signin/ios/browser",

ios/chrome/browser/signin/identity_test_environment_chrome_browser_state_adaptor.cc

@@ -8,7 +8,6 @@
 
 #include "base/bind.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
-#include "components/signin/core/browser/test_image_decoder.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"

services/identity/BUILD.gn

@@ -33,6 +33,7 @@ source_set("tests") {
     ":lib",
     "//base",
     "//base/test:test_support",
+    "//components/image_fetcher/core:test_support",
     "//components/prefs:test_support",
     "//components/signin/core/browser:internals",
     "//components/signin/core/browser:internals_test_support",

services/identity/DEPS

@@ -1,9 +1,9 @@
 include_rules = [
+  "+components/image_fetcher/core/fake_image_decoder.h",
   "+components/prefs/pref_service.h",
   "+components/signin/core/browser/account_info.h",
   "+components/signin/core/browser/account_tracker_service.h",
   "+components/signin/core/browser/device_id_helper.h",
-  "+components/signin/core/browser/test_image_decoder.h",
   "+components/signin/core/browser/fake_profile_oauth2_token_service.h",
   "+components/signin/core/browser/fake_signin_manager.h",
   "+components/signin/core/browser/profile_oauth2_token_service.h",

services/identity/identity_accessor_impl_unittest.cc

@@ -6,11 +6,11 @@
 #include "base/run_loop.h"
 #include "base/test/scoped_task_environment.h"
 #include "build/build_config.h"
+#include "components/image_fetcher/core/fake_image_decoder.h"
 #include "components/signin/core/browser/account_info.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
-#include "components/signin/core/browser/test_image_decoder.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "services/identity/identity_service.h"
@@ -71,9 +71,9 @@ class IdentityAccessorImplTest : public testing::Test {
     SigninManagerBase::RegisterPrefs(pref_service_.registry());
 
     account_tracker_.Initialize(&pref_service_, base::FilePath());
-    account_fetcher_.Initialize(&signin_client_, &token_service_,
-                                &account_tracker_,
-                                std::make_unique<TestImageDecoder>());
+    account_fetcher_.Initialize(
+        &signin_client_, &token_service_, &account_tracker_,
+        std::make_unique<image_fetcher::FakeImageDecoder>());
     signin_manager_.Initialize(&pref_service_);
   }
 

services/identity/public/cpp/DEPS

@@ -1,10 +1,10 @@
 include_rules = [
+  "+components/image_fetcher/core/fake_image_decoder.h",
   "+components/prefs/testing_pref_service.h",
   "+components/signin/core/browser/account_consistency_method.h",
   "+components/signin/core/browser/account_fetcher_service.h",
   "+components/signin/core/browser/account_info.h",
   "+components/signin/core/browser/child_account_info_fetcher_android.h",
-  "+components/signin/core/browser/test_image_decoder.h",
   "+components/signin/core/browser/gaia_cookie_manager_service.h",
   "+components/signin/core/browser/list_accounts_test_utils.h",
   "+components/signin/core/browser/oauth2_token_service_delegate_android.h",

services/identity/public/cpp/identity_manager_unittest.cc

@@ -16,13 +16,13 @@
 #include "base/stl_util.h"
 #include "base/test/bind_test_util.h"
 #include "build/build_config.h"
+#include "components/image_fetcher/core/fake_image_decoder.h"
 #include "components/signin/core/browser/account_consistency_method.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
 #include "components/signin/core/browser/list_accounts_test_utils.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_switches.h"
-#include "components/signin/core/browser/test_image_decoder.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "google_apis/gaia/google_service_auth_error.h"
@@ -341,9 +341,9 @@ class IdentityManagerTest : public testing::Test {
     SigninManagerBase::RegisterPrefs(pref_service_.registry());
 
     account_tracker_.Initialize(&pref_service_, base::FilePath());
-    account_fetcher_.Initialize(&signin_client_, &token_service_,
-                                &account_tracker_,
-                                std::make_unique<TestImageDecoder>());
+    account_fetcher_.Initialize(
+        &signin_client_, &token_service_, &account_tracker_,
+        std::make_unique<image_fetcher::FakeImageDecoder>());
 
     RecreateSigninAndIdentityManager(
         signin::AccountConsistencyMethod::kDisabled,

services/identity/public/cpp/identity_test_environment.cc

@@ -9,11 +9,11 @@
 
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "components/image_fetcher/core/fake_image_decoder.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
 #include "components/signin/core/browser/gaia_cookie_manager_service.h"
 #include "components/signin/core/browser/signin_manager.h"
-#include "components/signin/core/browser/test_image_decoder.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "google_apis/gaia/oauth2_access_token_consumer.h"
@@ -131,9 +131,9 @@ IdentityManagerDependenciesOwner::IdentityManagerDependenciesOwner(
   SigninManagerBase::RegisterPrefs(pref_service()->registry());
 
   account_tracker_.Initialize(pref_service(), base::FilePath());
-  account_fetcher_.Initialize(signin_client(), &token_service_,
-                              &account_tracker_,
-                              std::make_unique<TestImageDecoder>());
+  account_fetcher_.Initialize(
+      signin_client(), &token_service_, &account_tracker_,
+      std::make_unique<image_fetcher::FakeImageDecoder>());
   signin_manager_.Initialize(pref_service());
 }