Reduce the size of content_browser_client.h

This CL reduces the estimated pre-processed size of
content_browser_client.h from 3.47MB to 2.85MB.

This CL has no behavior changes.

Change-Id: I567970cfa113607f9b1e0511cd4fffe6de1256ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2535895Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827156}

android_webview/browser/aw_content_browser_client.cc

@@ -105,6 +105,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/resource/resource_bundle_android.h"
 #include "ui/display/display.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/resources/grit/ui_resources.h"
 
 #if BUILDFLAG(ENABLE_SPELLCHECK)

chrome/browser/chromeos/extensions/printing/print_job_submitter.cc

@@ -32,6 +32,7 @@
 #include "printing/metafile_skia.h"
 #include "printing/print_settings.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace extensions {
 

content/browser/media/system_media_controls_notifier.cc

@@ -14,6 +14,7 @@
 #include "content/public/common/content_client.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/media_session/public/mojom/media_session.mojom.h"
+#include "ui/gfx/image/image_skia.h"
 
 #if defined(OS_WIN)
 #include "base/bind.h"

content/browser/renderer_host/render_view_host_unittest.cc

@@ -34,6 +34,7 @@
 #include "skia/ext/skia_utils_base.h"
 #include "third_party/blink/public/common/page/drag_operation.h"
 #include "ui/base/page_transition_types.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/skia_util.h"
 
 namespace content {

content/public/browser/content_browser_client.cc

@@ -9,7 +9,7 @@
 // declarations instead of including more headers. If that is infeasible, adjust
 // the limit. For more info, see
 // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md
-#pragma clang max_tokens_here 910000
+#pragma clang max_tokens_here 830000
 
 #include <utility>
 

content/public/browser/content_browser_client.h

@@ -53,7 +53,6 @@
 #include "ui/accessibility/ax_mode.h"
 #include "ui/base/page_transition_types.h"
 #include "ui/base/window_open_disposition.h"
-#include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 #include "url/url_constants.h"
@@ -102,6 +101,10 @@ namespace device {
 class LocationProvider;
 }  // namespace device
 
+namespace gfx {
+class ImageSkia;
+}  // namespace gfx
+
 namespace media {
 class AudioLogFactory;
 class AudioManager;