iwyu: Cleanup chrome/utility directory.

BUG=None
TEST=None

R=jhawkins@chromium.org

Review URL: http://codereview.chromium.org/6778023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79895 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 20 insertions, 17 deletions

diff --git a/chrome/utility/utility_main.cc b/chrome/utility/utility_main.cc
index f18368b..9d4a63d 100644
--- a/chrome/utility/utility_main.cc
+++ b/chrome/utility/utility_main.cc
@@ -3,15 +3,10 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
-#include "base/file_util.h"
 #include "base/message_loop.h"
-#include "base/path_service.h"
-#include "base/string_util.h"
 #include "base/threading/platform_thread.h"
-#include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
-#include "chrome/common/logging_chrome.h"
 #include "chrome/utility/utility_thread.h"
 #include "content/common/child_process.h"
 #include "content/common/hi_res_timer_manager.h"
@@ -20,6 +15,8 @@
 #include "ui/base/ui_base_switches.h"
 
 #if defined(OS_WIN)
+#include "base/file_util.h"
+#include "base/path_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/common/sandbox_init_wrapper.h"
 #include "sandbox/src/sandbox.h"
diff --git a/chrome/utility/utility_thread.cc b/chrome/utility/utility_thread.cc
index 3d6afdb..2cd9a56 100644
--- a/chrome/utility/utility_thread.cc
+++ b/chrome/utility/utility_thread.cc
@@ -4,11 +4,12 @@
 
 #include "chrome/utility/utility_thread.h"
 
+#include <stddef.h>
 #include <vector>
 
-#include "base/file_util.h"
-#include "base/path_service.h"
-#include "base/values.h"
+#include "base/file_path.h"
+#include "base/logging.h"
+#include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_unpacker.h"
@@ -18,19 +19,20 @@
 #include "content/common/child_process.h"
 #include "content/common/indexed_db_key.h"
 #include "content/common/serialized_script_value.h"
+#include "ipc/ipc_message_macros.h"
+#include "printing/backend/print_backend.h"
 #include "printing/page_range.h"
-#include "printing/units.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h"
-#include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
-#include "ui/gfx/size.h"
 #include "webkit/glue/idb_bindings.h"
 #include "webkit/glue/image_decoder.h"
 
 #if defined(OS_WIN)
 #include "app/win/iat_patch_function.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/path_service.h"
 #include "base/win/scoped_handle.h"
 #include "printing/emf_win.h"
 #endif
diff --git a/chrome/utility/utility_thread.h b/chrome/utility/utility_thread.h
index c5e32c7..a2877c3 100644
--- a/chrome/utility/utility_thread.h
+++ b/chrome/utility/utility_thread.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -9,22 +9,26 @@
 #include <string>
 #include <vector>
 
+#include "base/basictypes.h"
+#include "base/string16.h"
 #include "base/platform_file.h"
 #include "content/common/child_thread.h"
-#include "printing/native_metafile.h"
 
-class GURL;
+class FilePath;
 class IndexedDBKey;
 class SerializedScriptValue;
-class SkBitmap;
 
 namespace gfx {
 class Rect;
-}  // namespace gfx
+}
+
+namespace IPC {
+class Message;
+}
 
 namespace printing {
 struct PageRange;
-}  // namespace printing
+}
 
 // This class represents the background thread where the utility task runs.
 class UtilityThread : public ChildThread {