4 files changed, 3 insertions, 42 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index f408f51..ea092ea 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -742,7 +742,6 @@ if not env.Bit('windows'):
       'printing/printed_page.cc',
       'printing/printer_query.cc',
       'printing/win_printing_context.cc',
-      'renderer_host/cross_site_resource_handler.cc',
       'rlz/rlz.cc',
       'safe_browsing/safe_browsing_blocking_page.cc',
       'sandbox_policy.cc',
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index 5b58ce8..65b5c3d 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/cross_site_request_manager.h"
 #include "chrome/browser/renderer_host/async_resource_handler.h"
 #include "chrome/browser/renderer_host/buffered_resource_handler.h"
+#include "chrome/browser/renderer_host/cross_site_resource_handler.h"
 #include "chrome/browser/renderer_host/download_resource_handler.h"
 #include "chrome/browser/renderer_host/renderer_security_policy.h"
 #include "chrome/browser/renderer_host/resource_request_details.h"
@@ -44,7 +45,6 @@
 #include "chrome/browser/external_protocol_handler.h"
 #include "chrome/browser/login_prompt.h"
 #include "chrome/browser/plugin_service.h"
-#include "chrome/browser/renderer_host/cross_site_resource_handler.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index d3b0f56..db69fcc 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -332,6 +332,7 @@
 		BA3176FD0F410A2F0065D532 /* tab_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6CCB9EA0F1EC32700106F0D /* tab_util.cc */; };
 		BA60A6800F3CB09F005A6703 /* protocol_manager_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFAD70E9D49DE009A6919 /* protocol_manager_unittest.cc */; };
 		BAA609ED0F3BCAA800783510 /* protocol_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFAD50E9D49DE009A6919 /* protocol_manager.cc */; };
+		BAC2B8AD0F436C7F0063A33E /* cross_site_resource_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = A7C613DC0F30D886008CEE5D /* cross_site_resource_handler.cc */; };
 		BADB8B710F3A35AC00989B26 /* resource_dispatcher_host.cc in Sources */ = {isa = PBXBuildFile; fileRef = BADB8B6D0F3A356000989B26 /* resource_dispatcher_host.cc */; };
 		CA81330E0F423C4D0096C1DC /* query_parser_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFA020E9D48F7009A6919 /* query_parser_unittest.cc */; };
 		CA8133120F423C710096C1DC /* url_database_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFA150E9D48F7009A6919 /* url_database_unittest.cc */; };
@@ -5251,6 +5252,7 @@
 				4D7BFAEF0E9D49E7009A6919 /* chunk_range.cc in Sources */,
 				E46C4ED40F27A94100B393B8 /* command_updater.cc in Sources */,
 				4D7BF9970E9D4863009A6919 /* cross_site_request_manager.cc in Sources */,
+				BAC2B8AD0F436C7F0063A33E /* cross_site_resource_handler.cc in Sources */,
 				4D7BFA7C0E9D4994009A6919 /* dns_host_info.cc in Sources */,
 				E4F324550EE5CFB1002533CE /* download_database.cc in Sources */,
 				E43A77170F16616E00ABD5D1 /* download_resource_handler.cc in Sources */,
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index dcf8eda..02b10db 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -1171,46 +1171,6 @@ LoginHandler* CreateLoginPrompt(net::AuthChallengeInfo* auth_info,
                                 URLRequest* request,
                                 MessageLoop* ui_loop);
 
-class CrossSiteResourceHandler : public ResourceHandler {
- public:
-  CrossSiteResourceHandler(ResourceHandler* resource,
-                           int render_process_host_id,
-                           int render_view_id,
-                           ResourceDispatcherHost* rdh) {
-    NOTIMPLEMENTED();
-  }
-
-  void ResumeResponse() { NOTIMPLEMENTED(); }
-  bool OnUploadProgress(int request_id, uint64 position, uint64 size) {
-    NOTIMPLEMENTED();
-    return true;
-  }
-  bool OnRequestRedirected(int request_id, const GURL& url) {
-    NOTIMPLEMENTED();
-    return true;
-  }
-  bool OnResponseStarted(int request_id, ResourceResponse* response) {
-    NOTIMPLEMENTED();
-    return true;
-  }
-  bool OnWillRead(int request_id,
-                  net::IOBuffer** buf,
-                  int* buf_size,
-                  int min_size) {
-    NOTIMPLEMENTED();
-    return true;
-  }
-  bool OnReadCompleted(int request_id, int* bytes_read) {
-    NOTIMPLEMENTED();
-    return true;
-  }
-  bool OnResponseCompleted(int request_id,
-                           const URLRequestStatus& status) {
-    NOTIMPLEMENTED();
-    return true;
-  }
-};
-
 class ExternalProtocolHandler {
  public:
   static void LaunchUrl(const GURL& url, int render_process_host_id,