Remove temporary redirect header and DEPS exception for cancelable_request.h

TBR=jam@chromium.org
BUG=98716

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

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

7 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h
index 18d1959..00365b5 100644
--- a/chrome/browser/history/history.h
+++ b/chrome/browser/history/history.h
@@ -16,11 +16,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/task.h"
+#include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 #include "chrome/common/ref_counted_util.h"
-#include "content/browser/cancelable_request.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/page_transition_types.h"
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc
index b5c6d42..1d86061 100644
--- a/chrome/browser/history/history_backend.cc
+++ b/chrome/browser/history/history_backend.cc
@@ -21,6 +21,7 @@
 #include "base/time.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/bookmarks/bookmark_service.h"
+#include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_publisher.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
@@ -29,7 +30,6 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/cancelable_request.h"
 #include "content/browser/download/download_persistent_store_info.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h
index 23ac69c..be23c7c 100644
--- a/chrome/browser/history/history_backend.h
+++ b/chrome/browser/history/history_backend.h
@@ -13,6 +13,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/mru_cache.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/archived_database.h"
 #include "chrome/browser/history/expire_history_backend.h"
 #include "chrome/browser/history/history_database.h"
@@ -22,7 +23,6 @@
 #include "chrome/browser/history/thumbnail_database.h"
 #include "chrome/browser/history/visit_tracker.h"
 #include "chrome/browser/search_engines/template_url_id.h"
-#include "content/browser/cancelable_request.h"
 #include "sql/init_status.h"
 
 class BookmarkService;
diff --git a/chrome/browser/history/history_marshaling.h b/chrome/browser/history/history_marshaling.h
index ac3a702..46c91e4 100644
--- a/chrome/browser/history/history_marshaling.h
+++ b/chrome/browser/history/history_marshaling.h
@@ -10,10 +10,10 @@
 #pragma once
 
 #include "base/memory/scoped_vector.h"
+#include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/page_usage_data.h"
-#include "content/browser/cancelable_request.h"
 
 namespace history {
 
diff --git a/chrome/browser/history/top_sites.h b/chrome/browser/history/top_sites.h
index 5423fac..0d57432 100644
--- a/chrome/browser/history/top_sites.h
+++ b/chrome/browser/history/top_sites.h
@@ -19,11 +19,11 @@
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "base/timer.h"
-#include "chrome/browser/history/history_types.h"
+#include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history.h"
+#include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/common/thumbnail_score.h"
-#include "content/browser/cancelable_request.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/image/image.h"
diff --git a/chrome/browser/history/top_sites_backend.h b/chrome/browser/history/top_sites_backend.h
index 95ff242..36330fb 100644
--- a/chrome/browser/history/top_sites_backend.h
+++ b/chrome/browser/history/top_sites_backend.h
@@ -10,8 +10,8 @@
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history_types.h"
-#include "content/browser/cancelable_request.h"
 
 class FilePath;
 
diff --git a/chrome/browser/history/top_sites_extension_api.h b/chrome/browser/history/top_sites_extension_api.h
index 9693b80..ca9ef8d 100644
--- a/chrome/browser/history/top_sites_extension_api.h
+++ b/chrome/browser/history/top_sites_extension_api.h
@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_HISTORY_TOP_SITES_EXTENSION_API_H_
 #pragma once
 
+#include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/history/history_types.h"
-#include "content/browser/cancelable_request.h"
 
 class GetTopSitesFunction : public AsyncExtensionFunction {
  public: