Split FaviconService and FaviconServiceImpl.

ios/chrome/browser/ui/reading_list/reading_list_collection_view_controller_unittest.mm

 // Copyright 2016 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.
 
 #import "ios/chrome/browser/ui/reading_list/reading_list_collection_view_controller.h"
 
 #include <unordered_set>
 
 #import "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "components/favicon/core/favicon_client.h"
-#include "components/favicon/core/favicon_service.h"
 #include "components/favicon/core/large_icon_service.h"
+#include "components/favicon/core/test/mock_favicon_service.h"
 #include "components/reading_list/ios/reading_list_model.h"
 #include "components/reading_list/ios/reading_list_model_impl.h"
 #include "components/reading_list/ios/reading_list_model_storage.h"
 #include "components/url_formatter/url_formatter.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
 #include "ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_collection_view_item.h"
 #include "ios/web/public/test/test_web_thread_bundle.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 #import "third_party/ocmock/gtest_support.h"
 
-namespace {
-
-#pragma mark - MockFaviconService
-
-// A mock FaviconService that emits an empty response.
-class MockFaviconService : public favicon::FaviconService {
- public:
-  MockFaviconService() : FaviconService(nullptr, nullptr) {}
-
-  ~MockFaviconService() override {}
-
-  base::CancelableTaskTracker::TaskId GetLargestRawFaviconForPageURL(
-      const GURL& page_url,
-      const std::vector<int>& icon_types,
-      int minimum_size_in_pixels,
-      const favicon_base::FaviconRawBitmapCallback& callback,
-      base::CancelableTaskTracker* tracker) override {
-    favicon_base::FaviconRawBitmapResult mock_result;
-    return tracker->PostTask(base::ThreadTaskRunnerHandle::Get().get(),
-                             FROM_HERE, base::Bind(callback, mock_result));
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MockFaviconService);
-};
-
-}  // namespace
+using favicon::PostCallbackWithResult;
+using testing::WithArg;
+using testing::_;
 
 #pragma mark - ReadingListCollectionViewControllerTest
 
 class ReadingListCollectionViewControllerTest : public testing::Test {
  public:
   ReadingListCollectionViewControllerTest() {}
   ~ReadingListCollectionViewControllerTest() override {}
 
+  testing::StrictMock<favicon::MockFaviconService> mock_favicon_service_;
   std::unique_ptr<ReadingListModelImpl> reading_list_model_;
   std::unique_ptr<favicon::LargeIconService> large_icon_service_;
-  std::unique_ptr<MockFaviconService> mock_favicon_service_;
 
   base::scoped_nsobject<ReadingListCollectionViewController>
       reading_list_view_controller_;
   id mock_delegate_;
 
   // TODO(crbug.com/625617) When offline url can be opened, use a mock for the
   // readinglistdownloadservice.
   void SetUp() override {
     testing::Test::SetUp();
-    mock_favicon_service_.reset(new MockFaviconService());
+
+    EXPECT_CALL(mock_favicon_service_,
+                GetLargestRawFaviconForPageURL(_, _, _, _, _))
+        .WillRepeatedly(WithArg<3>(
+            PostCallbackWithResult(favicon_base::FaviconRawBitmapResult())));
 
     reading_list_model_.reset(new ReadingListModelImpl(nullptr, nullptr));
     large_icon_service_.reset(new favicon::LargeIconService(
-        mock_favicon_service_.get(), base::ThreadTaskRunnerHandle::Get()));
+        &mock_favicon_service_, base::ThreadTaskRunnerHandle::Get()));
     reading_list_view_controller_.reset(
         [[ReadingListCollectionViewController alloc]
                          initWithModel:reading_list_model_.get()
                       largeIconService:large_icon_service_.get()
             readingListDownloadService:nil
                                toolbar:nil]);
 
     mock_delegate_ = [OCMockObject
         niceMockForProtocol:@protocol(
                                 ReadingListCollectionViewControllerDelegate)];
@@ skipping 127 matching lines @@
       base::mac::ObjCCastStrict<ReadingListCollectionViewItem>(
           [[reading_list_view_controller_ collectionViewModel]
               itemAtIndexPath:indexPath]);
   EXPECT_EQ(base::SysNSStringToUTF8([readingListItem text]), title);
   EXPECT_EQ([readingListItem url], url);
   EXPECT_EQ(base::SysNSStringToUTF16([readingListItem detailText]),
             url_formatter::FormatUrl(url));
   EXPECT_EQ([readingListItem faviconPageURL], distilled_url);
   EXPECT_EQ([readingListItem distillationState], ReadingListEntry::PROCESSED);
 }