Move ByteStream to content/browser

BUG=180833


Review URL: https://chromiumcodereview.appspot.com/12440036

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

15 files changed, 20 insertions, 20 deletions

diff --git a/content/browser/download/byte_stream.cc b/content/browser/byte_stream.cc
index 26224ad..44f5ce3 100644
--- a/content/browser/download/byte_stream.cc
+++ b/content/browser/byte_stream.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/download/byte_stream.h"
+#include "content/browser/byte_stream.h"
 
 #include "base/bind.h"
 #include "base/location.h"
-#include "base/memory/weak_ptr.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner.h"
 
 namespace content {
diff --git a/content/browser/download/byte_stream.h b/content/browser/byte_stream.h
index d8302ec..dc702f0 100644
--- a/content/browser/download/byte_stream.h
+++ b/content/browser/byte_stream.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_DOWNLOAD_BYTE_STREAM_H_
-#define CONTENT_BROWSER_DOWNLOAD_BYTE_STREAM_H_
+#ifndef CONTENT_BROWSER_BYTE_STREAM_H_
+#define CONTENT_BROWSER_BYTE_STREAM_H_
 
+#include <deque>
 #include <set>
 #include <utility>
-#include <deque>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ -196,4 +196,4 @@ CONTENT_EXPORT void CreateByteStream(
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DOWNLOAD_BYTE_STREAM_H_
+#endif  // CONTENT_BROWSER_BYTE_STREAM_H_
diff --git a/content/browser/download/byte_stream_unittest.cc b/content/browser/byte_stream_unittest.cc
index 5422a8b..9ef45a3 100644
--- a/content/browser/download/byte_stream_unittest.cc
+++ b/content/browser/byte_stream_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/download/byte_stream.h"
+#include "content/browser/byte_stream.h"
 
 #include <deque>
 
diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc
index b602497..26e951a 100644
--- a/content/browser/download/download_browsertest.cc
+++ b/content/browser/download/download_browsertest.cc
@@ -9,7 +9,7 @@
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
-#include "content/browser/download/byte_stream.h"
+#include "content/browser/byte_stream.h"
 #include "content/browser/download/download_file_factory.h"
 #include "content/browser/download/download_file_impl.h"
 #include "content/browser/download/download_item_impl.h"
diff --git a/content/browser/download/download_file_impl.cc b/content/browser/download/download_file_impl.cc
index fb6b095..ab95900 100644
--- a/content/browser/download/download_file_impl.cc
+++ b/content/browser/download/download_file_impl.cc
@@ -10,7 +10,7 @@
 #include "base/file_util.h"
 #include "base/message_loop_proxy.h"
 #include "base/time.h"
-#include "content/browser/download/byte_stream.h"
+#include "content/browser/byte_stream.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_interrupt_reasons_impl.h"
 #include "content/browser/download/download_net_log_parameters.h"
diff --git a/content/browser/download/download_file_impl.h b/content/browser/download/download_file_impl.h
index 3be1d0f..f3a3624 100644
--- a/content/browser/download/download_file_impl.h
+++ b/content/browser/download/download_file_impl.h
@@ -12,8 +12,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
+#include "content/browser/byte_stream.h"
 #include "content/browser/download/base_file.h"
-#include "content/browser/download/byte_stream.h"
 #include "content/public/browser/download_save_info.h"
 #include "net/base/net_log.h"
 
diff --git a/content/browser/download/download_file_unittest.cc b/content/browser/download/download_file_unittest.cc
index 4b965da..95e3a9c 100644
--- a/content/browser/download/download_file_unittest.cc
+++ b/content/browser/download/download_file_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/string_number_conversions.h"
 #include "base/test/test_file_util.h"
 #include "content/browser/browser_thread_impl.h"
-#include "content/browser/download/byte_stream.h"
+#include "content/browser/byte_stream.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file_impl.h"
 #include "content/browser/download/download_request_handle.h"
diff --git a/content/browser/download/download_item_impl_unittest.cc b/content/browser/download/download_item_impl_unittest.cc
index 47e89b1..58c4f53 100644
--- a/content/browser/download/download_item_impl_unittest.cc
+++ b/content/browser/download/download_item_impl_unittest.cc
@@ -6,7 +6,7 @@
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
-#include "content/browser/download/byte_stream.h"
+#include "content/browser/byte_stream.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file_factory.h"
 #include "content/browser/download/download_item_impl.h"
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc
index 752f16d..2e192ed 100644
--- a/content/browser/download/download_manager_impl.cc
+++ b/content/browser/download/download_manager_impl.cc
@@ -18,7 +18,7 @@
 #include "base/synchronization/lock.h"
 #include "base/sys_string_conversions.h"
 #include "build/build_config.h"
-#include "content/browser/download/byte_stream.h"
+#include "content/browser/byte_stream.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file_factory.h"
 #include "content/browser/download/download_item_factory.h"
diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc
index c16713c..f7d6e61c 100644
--- a/content/browser/download/download_manager_impl_unittest.cc
+++ b/content/browser/download/download_manager_impl_unittest.cc
@@ -16,7 +16,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "content/browser/download/byte_stream.h"
+#include "content/browser/byte_stream.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file_factory.h"
 #include "content/browser/download/download_item_factory.h"
diff --git a/content/browser/download/download_resource_handler.cc b/content/browser/download/download_resource_handler.cc
index f0e6491..a803d01 100644
--- a/content/browser/download/download_resource_handler.cc
+++ b/content/browser/download/download_resource_handler.cc
@@ -12,11 +12,11 @@
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
 #include "base/stringprintf.h"
+#include "content/browser/byte_stream.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_interrupt_reasons_impl.h"
 #include "content/browser/download/download_manager_impl.h"
 #include "content/browser/download/download_request_handle.h"
-#include "content/browser/download/byte_stream.h"
 #include "content/browser/download/download_stats.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_request_info_impl.h"
diff --git a/content/browser/streams/stream.h b/content/browser/streams/stream.h
index 116d31a..3823262 100644
--- a/content/browser/streams/stream.h
+++ b/content/browser/streams/stream.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "content/browser/download/byte_stream.h"
+#include "content/browser/byte_stream.h"
 #include "content/common/content_export.h"
 #include "googleurl/src/gurl.h"
 
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 33b9aca7..1fd17b8 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -290,6 +290,8 @@
     'browser/browser_url_handler_impl.h',
     'browser/browsing_instance.cc',
     'browser/browsing_instance.h',
+    'browser/byte_stream.cc',
+    'browser/byte_stream.h',
     'browser/cert_store_impl.cc',
     'browser/cert_store_impl.h',
     'browser/child_process_launcher.cc',
@@ -360,8 +362,6 @@
     'browser/download/base_file_mac.cc',
     'browser/download/base_file_posix.cc',
     'browser/download/base_file_win.cc',
-    'browser/download/byte_stream.cc',
-    'browser/download/byte_stream.h',
     'browser/download/download_create_info.cc',
     'browser/download/download_create_info.h',
     'browser/download/download_file.h',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 8e03320..883c199 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -257,12 +257,12 @@
         'browser/appcache/chrome_appcache_service_unittest.cc',
         'browser/browser_thread_unittest.cc',
         'browser/browser_url_handler_impl_unittest.cc',
+        'browser/byte_stream_unittest.cc',
         'browser/child_process_security_policy_unittest.cc',
         'browser/devtools/devtools_http_handler_unittest.cc',
         'browser/devtools/devtools_manager_unittest.cc',
         'browser/device_orientation/provider_unittest.cc',
         'browser/download/base_file_unittest.cc',
-        'browser/download/byte_stream_unittest.cc',
         'browser/download/download_file_unittest.cc',
         'browser/download/download_id_unittest.cc',
         'browser/download/download_item_impl_unittest.cc',
diff --git a/content/public/test/mock_download_manager.cc b/content/public/test/mock_download_manager.cc
index 39cb4a3..acf6ac2 100644
--- a/content/public/test/mock_download_manager.cc
+++ b/content/public/test/mock_download_manager.cc
@@ -4,7 +4,7 @@
 
 #include "content/public/test/mock_download_manager.h"
 
-#include "content/browser/download/byte_stream.h"
+#include "content/browser/byte_stream.h"
 #include "content/browser/download/download_create_info.h"
 
 namespace content {