8 files changed, 9 insertions, 14 deletions
diff --git a/content/browser/download/download_create_info.h b/content/browser/download/download_create_info.h
index dbfee7f..9aad9a5 100644
--- a/content/browser/download/download_create_info.h
+++ b/content/browser/download/download_create_info.h
@@ -12,9 +12,9 @@
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/time.h"
+#include "content/browser/download/download_file.h"
 #include "content/browser/download/download_types.h"
 #include "content/common/content_export.h"
-#include "content/public/browser/download_file.h"
 #include "content/public/browser/download_id.h"
 #include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
diff --git a/content/public/browser/download_file.h b/content/browser/download/download_file.h
index b242a99..8d79bee 100644
--- a/content/public/browser/download_file.h
+++ b/content/browser/download/download_file.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 CONTENT_PUBLIC_BROWSER_DOWNLOAD_FILE_H_
-#define CONTENT_PUBLIC_BROWSER_DOWNLOAD_FILE_H_
+#ifndef CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_FILE_H_
+#define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_FILE_H_
 #pragma once
 
 #include <string>
@@ -96,4 +96,4 @@ class CONTENT_EXPORT DownloadFile {
 
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_BROWSER_DOWNLOAD_FILE_H_
+#endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_FILE_H_
diff --git a/content/browser/download/download_file_impl.h b/content/browser/download/download_file_impl.h
index 0521435..67eb057 100644
--- a/content/browser/download/download_file_impl.h
+++ b/content/browser/download/download_file_impl.h
@@ -6,15 +6,11 @@
 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_FILE_IMPL_H_
 #pragma once
 
-#include "content/public/browser/download_file.h"
+#include "content/browser/download/download_file.h"
 
-#include <string>
-
-#include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/download/base_file.h"
 #include "content/browser/download/download_request_handle.h"
-#include "content/common/content_export.h"
 
 struct DownloadCreateInfo;
 
diff --git a/content/browser/download/download_file_manager.cc b/content/browser/download/download_file_manager.cc
index a58cb78..e093185 100644
--- a/content/browser/download/download_file_manager.cc
+++ b/content/browser/download/download_file_manager.cc
@@ -21,7 +21,6 @@
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/download_file.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_manager_delegate.h"
 #include "googleurl/src/gurl.h"
diff --git a/content/browser/download/download_item_impl.cc b/content/browser/download/download_item_impl.cc
index 2d1ad6d..0d1ac13 100644
--- a/content/browser/download/download_item_impl.cc
+++ b/content/browser/download/download_item_impl.cc
@@ -18,6 +18,7 @@
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/download/download_create_info.h"
+#include "content/browser/download/download_file.h"
 #include "content/browser/download/download_file_manager.h"
 #include "content/browser/download/download_persistent_store_info.h"
 #include "content/browser/download/download_request_handle.h"
@@ -26,7 +27,6 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
-#include "content/public/browser/download_file.h"
 #include "net/base/net_util.h"
 
 using content::BrowserThread;
diff --git a/content/browser/download/drag_download_file.h b/content/browser/download/drag_download_file.h
index 9251d9c..d975599 100644
--- a/content/browser/download/drag_download_file.h
+++ b/content/browser/download/drag_download_file.h
@@ -9,8 +9,8 @@
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/linked_ptr.h"
+#include "content/browser/download/download_file.h"
 #include "content/common/content_export.h"
-#include "content/public/browser/download_file.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "googleurl/src/gurl.h"
diff --git a/content/browser/download/mock_download_file.h b/content/browser/download/mock_download_file.h
index 6aff4da..e7fb301 100644
--- a/content/browser/download/mock_download_file.h
+++ b/content/browser/download/mock_download_file.h
@@ -11,7 +11,7 @@
 
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
-#include "content/public/browser/download_file.h"
+#include "content/browser/download/download_file.h"
 #include "content/public/browser/download_id.h"
 #include "content/public/browser/download_manager.h"
 #include "net/base/net_errors.h"
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 834506c..420ae58 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -50,7 +50,6 @@
     'public/browser/devtools_http_handler.h',
     'public/browser/devtools_http_handler_delegate.h',
     'public/browser/devtools_manager.h',
-    'public/browser/download_file.h',
     'public/browser/download_item.h',
     'public/browser/download_manager.h',
     'public/browser/download_query.cc',
@@ -195,6 +194,7 @@
     'browser/download/download_buffer.h',
     'browser/download/download_create_info.cc',
     'browser/download/download_create_info.h',
+    'browser/download/download_file.h',
     'browser/download/download_file_impl.cc',
     'browser/download/download_file_impl.h',
     'browser/download/download_file_manager.cc',