FBTF: Remove unneeded headers from base/ (part 6)

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3093013

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

5 files changed, 15 insertions, 11 deletions

diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 41b1c95..114bdd4 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <string>
 #include <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
+#include <string>
+
 #include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ -18,6 +19,7 @@
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "base/values.h"
 #include "base/win_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/setup/install.h"
diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h
index 22de943..0082a17 100644
--- a/chrome/installer/util/master_preferences.h
+++ b/chrome/installer/util/master_preferences.h
@@ -12,11 +12,12 @@
 #include <vector>
 
 #include "base/command_line.h"
-#include "base/file_path.h"
-#include "base/values.h"
 #include "googleurl/src/gurl.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 
+class DictionaryValue;
+class FilePath;
+
 namespace installer_util {
 
 // This is the default name for the master preferences file used to pre-set
diff --git a/chrome/installer/util/move_tree_work_item.h b/chrome/installer/util/move_tree_work_item.h
index 98fe679..69aa845 100644
--- a/chrome/installer/util/move_tree_work_item.h
+++ b/chrome/installer/util/move_tree_work_item.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -6,9 +6,11 @@
 #define CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_
 #pragma once
 
-#include <string>
 #include <windows.h>
 
+#include <string>
+
+#include "base/file_path.h"
 #include "chrome/installer/util/work_item.h"
 
 // A WorkItem subclass that recursively move a file system hierarchy from
diff --git a/chrome/installer/util/work_item.h b/chrome/installer/util/work_item.h
index c550adb..3b26d3a 100644
--- a/chrome/installer/util/work_item.h
+++ b/chrome/installer/util/work_item.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 //
@@ -13,13 +13,12 @@
 #include <windows.h>
 #include <string>
 
-#include "base/file_path.h"
-
 class CopyTreeWorkItem;
 class CreateDirWorkItem;
 class CreateRegKeyWorkItem;
 class DeleteTreeWorkItem;
 class DeleteRegValueWorkItem;
+class FilePath;
 class MoveTreeWorkItem;
 class SelfRegWorkItem;
 class SetRegValueWorkItem;
diff --git a/chrome/installer/util/work_item_list.h b/chrome/installer/util/work_item_list.h
index 4ed9a59..cbf68a3 100644
--- a/chrome/installer/util/work_item_list.h
+++ b/chrome/installer/util/work_item_list.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -11,10 +11,10 @@
 #include <list>
 #include <string>
 
-#include "base/file_path.h"
-
 #include "chrome/installer/util/work_item.h"
 
+class FilePath;
+
 // A WorkItem subclass that recursively contains a list of WorkItems. Thus it
 // provides functionalities to carry out or roll back the sequence of actions
 // defined by the list of WorkItems it contains.