Move ImageDecoder to components/image_fetcher/content

components/image_fetcher/content/image_decoder.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 "chrome/browser/image_decoder.h"
+#include "components/image_fetcher/content/image_decoder.h"
 
+#include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/service_manager_connection.h"
 #include "ipc/ipc_channel.h"
 #include "services/data_decoder/public/cpp/decode_image.h"
@@ skipping 20 matching lines @@
 }
 
 void BindToBrowserConnector(service_manager::mojom::ConnectorRequest request) {
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
     content::BrowserThread::PostTask(
         content::BrowserThread::UI, FROM_HERE,
         base::Bind(&BindToBrowserConnector, base::Passed(&request)));
     return;
   }
 
-  content::ServiceManagerConnection::GetForProcess()->GetConnector()
+  content::ServiceManagerConnection::GetForProcess()
+      ->GetConnector()
       ->BindConnectorRequest(std::move(request));
 }
 
 void RunDecodeCallbackOnTaskRunner(
     const data_decoder::mojom::ImageDecoder::DecodeImageCallback& callback,
     scoped_refptr<base::SequencedTaskRunner> task_runner,
     const SkBitmap& image) {
   task_runner->PostTask(FROM_HERE, base::Bind(callback, image));
 }
 
@@ skipping 131 matching lines @@
   for (auto it = image_request_id_map_.begin();
        it != image_request_id_map_.end();) {
     if (it->second == image_request) {
       image_request_id_map_.erase(it++);
     } else {
       ++it;
     }
   }
 }
 
-void ImageDecoder::OnDecodeImageSucceeded(
-    const SkBitmap& decoded_image,
-    int request_id) {
+void ImageDecoder::OnDecodeImageSucceeded(const SkBitmap& decoded_image,
+                                          int request_id) {
   ImageRequest* image_request;
   {
     base::AutoLock lock(map_lock_);
     auto it = image_request_id_map_.find(request_id);
     if (it == image_request_id_map_.end())
       return;
     image_request = it->second;
     image_request_id_map_.erase(it);
   }
 
   DCHECK(image_request->task_runner()->RunsTasksOnCurrentThread());
   image_request->OnImageDecoded(decoded_image);
 }
 
 void ImageDecoder::OnDecodeImageFailed(int request_id) {
   ImageRequest* image_request;
   {
     base::AutoLock lock(map_lock_);
     auto it = image_request_id_map_.find(request_id);
     if (it == image_request_id_map_.end())
       return;
     image_request = it->second;
     image_request_id_map_.erase(it);
   }
 
   DCHECK(image_request->task_runner()->RunsTasksOnCurrentThread());
   image_request->OnDecodeImageFailed();
 }