Revert 67662 - FBTF: Remove unneeded headers from base/ (part 10)

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

TBR=thestig@chromium.org
Review URL: http://codereview.chromium.org/5270010

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

5 files changed, 9 insertions, 3 deletions

diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h
index 5c02019..5cf1304 100644
--- a/chrome_frame/chrome_frame_automation.h
+++ b/chrome_frame/chrome_frame_automation.h
@@ -15,6 +15,7 @@
 #include "base/ref_counted.h"
 #include "base/scoped_handle.h"
 #include "base/stack_container.h"
+#include "base/task.h"
 #include "base/timer.h"
 #include "base/thread.h"
 #include "chrome/common/page_zoom.h"
diff --git a/chrome_frame/chrome_frame_histograms.h b/chrome_frame/chrome_frame_histograms.h
index c850c1f..b33efac 100644
--- a/chrome_frame/chrome_frame_histograms.h
+++ b/chrome_frame/chrome_frame_histograms.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_FRAME_CHROME_FRAME_HISTOGRAMS_H_
-#define CHROME_FRAME_CHROME_FRAME_HISTOGRAMS_H_
+#ifndef CHROME_FRAME_HISTOGRAM_SNAPSHOTS_H_
+#define CHROME_FRAME_HISTOGRAM_SNAPSHOTS_H_
 
 #include <map>
 #include <string>
@@ -14,6 +14,7 @@
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/scoped_ptr.h"
+#include "base/task.h"
 
 // This class gathers histogram data in the host browser process and
 // serializes the data into a vector of strings to be uploaded to the
@@ -54,4 +55,4 @@ class ChromeFrameHistogramSnapshots {
   DISALLOW_COPY_AND_ASSIGN(ChromeFrameHistogramSnapshots);
 };
 
-#endif  // CHROME_FRAME_CHROME_FRAME_HISTOGRAMS_H_
+#endif  // CHROME_RENDERER_HISTOGRAM_SNAPSHOTS_H_
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index c4d9cc6..d976e15 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -13,6 +13,7 @@
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
+#include "base/lock.h"
 #include "base/logging.h"
 #include "base/logging_win.h"
 #include "base/path_service.h"
@@ -310,6 +311,7 @@ HRESULT SetupRunOnce() {
     // Use this only for the dev channel and CEEE channels.
     if (channel_name.find(L"dev") != std::wstring::npos ||
         channel_name.find(L"ceee") != std::wstring::npos) {
+
       HKEY hive = HKEY_CURRENT_USER;
       if (IsSystemProcess()) {
         // For system installs, our updates will be running as SYSTEM which
diff --git a/chrome_frame/test/html_util_unittests.cc b/chrome_frame/test/html_util_unittests.cc
index d6667ec..02b54a4 100644
--- a/chrome_frame/test/html_util_unittests.cc
+++ b/chrome_frame/test/html_util_unittests.cc
@@ -15,6 +15,7 @@
 #include "base/process_util.h"
 #include "base/ref_counted.h"
 #include "base/scoped_handle.h"
+#include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/net_util.h"
 
diff --git a/chrome_frame/urlmon_url_request.h b/chrome_frame/urlmon_url_request.h
index b62fbc2..18099fd 100644
--- a/chrome_frame/urlmon_url_request.h
+++ b/chrome_frame/urlmon_url_request.h
@@ -11,6 +11,7 @@
 #include <map>
 #include <string>
 
+#include "base/lock.h"
 #include "base/thread.h"
 #include "chrome_frame/plugin_url_request.h"
 #include "chrome_frame/urlmon_moniker.h"