[Suggestions] Headers cleanup for iOS image encoder

BUG=None

Review URL: https://codereview.chromium.org/649793002

Cr-Commit-Position: refs/heads/master@{#299188}

components/suggestions.gypi

@@ -24,6 +24,7 @@
       'sources': [
         'suggestions/blacklist_store.cc',
         'suggestions/blacklist_store.h',
+        'suggestions/image_encoder.h',
         'suggestions/image_fetcher.h',
         'suggestions/image_fetcher_delegate.h',
         'suggestions/image_manager.cc',
@@ -46,13 +47,11 @@
       'conditions': [
         ['OS == "ios"', {
           'sources': [
-            'suggestions/image_encoder_ios.h',
             'suggestions/image_encoder_ios.mm',
           ]
         }, { # 'OS != "ios"'
           'sources': [
             'suggestions/image_encoder.cc',
-            'suggestions/image_encoder.h',
           ]
         }
       ]]

components/suggestions/BUILD.gn

@@ -6,6 +6,7 @@ static_library("suggestions") {
   sources = [
     "blacklist_store.cc",
     "blacklist_store.h",
+    "image_encoder.h",
     "image_fetcher.h",
     "image_fetcher_delegate.h",
     "image_manager.cc",
@@ -33,13 +34,11 @@ static_library("suggestions") {
 
   if (is_ios) {
     sources += [
-      "image_encoder_ios.h",
       "image_encoder_ios.mm",
     ]
   } else {
     sources += [
       "image_encoder.cc",
-      "image_encoder.h",
     ]
   }
 }

components/suggestions/image_encoder_ios.h

-// Copyright 2014 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.
-
-#ifndef COMPONENTS_SUGGESTIONS_IMAGE_ENCODER_IOS_H_
-#define COMPONENTS_SUGGESTIONS_IMAGE_ENCODER_IOS_H_
-
-#include <vector>
-
-class SkBitmap;
-
-namespace suggestions {
-
-// From encoded bytes to SkBitmap. It's the caller's responsibility to delete
-// the bitmap.
-SkBitmap* DecodeJPEGToSkBitmap(const std::vector<unsigned char>& encoded_data);
-
-// From SkBitmap to a vector of JPEG-encoded bytes, |dst|.
-bool EncodeSkBitmapToJPEG(const SkBitmap& bitmap,
-                          std::vector<unsigned char>* dest);
-
-}  // namespace suggestions
-
-#endif  // COMPONENTS_SUGGESTIONS_IMAGE_ENCODER_IOS_H_

components/suggestions/image_encoder_ios.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/suggestions/image_encoder_ios.h"
+#include "components/suggestions/image_encoder.h"
 
 #import <UIKit/UIKit.h>
 

components/suggestions/image_manager.cc

@@ -5,13 +5,8 @@
 #include "components/suggestions/image_manager.h"
 
 #include "base/bind.h"
-#include "components/suggestions/image_fetcher.h"
-
-#if defined(OS_IOS)
-#include "components/suggestions/image_encoder_ios.h"
-#else
 #include "components/suggestions/image_encoder.h"
-#endif
+#include "components/suggestions/image_fetcher.h"
 
 using leveldb_proto::ProtoDatabase;
 

components/suggestions/image_manager_unittest.cc

@@ -8,6 +8,7 @@
 #include "base/run_loop.h"
 #include "components/leveldb_proto/proto_database.h"
 #include "components/leveldb_proto/testing/fake_db.h"
+#include "components/suggestions/image_encoder.h"
 #include "components/suggestions/image_fetcher.h"
 #include "components/suggestions/image_fetcher_delegate.h"
 #include "components/suggestions/image_manager.h"
@@ -17,12 +18,6 @@
 #include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"
 
-#if defined(OS_IOS)
-#include "components/suggestions/image_encoder_ios.h"
-#else
-#include "components/suggestions/image_encoder.h"
-#endif
-
 using ::testing::Return;
 using ::testing::StrictMock;
 using ::testing::_;