diff options
39 files changed, 18 insertions, 44 deletions
diff --git a/base/crypto/rsa_private_key.cc b/base/crypto/rsa_private_key.cc index 8b88b84..e8eb2ab 100644 --- a/base/crypto/rsa_private_key.cc +++ b/base/crypto/rsa_private_key.cc @@ -4,7 +4,6 @@ #include "base/crypto/rsa_private_key.h" -#include <iostream> #include <list> #include "base/logging.h" diff --git a/base/crypto/rsa_private_key_nss.cc b/base/crypto/rsa_private_key_nss.cc index a6b8ffa..4fc0650 100644 --- a/base/crypto/rsa_private_key_nss.cc +++ b/base/crypto/rsa_private_key_nss.cc @@ -8,7 +8,6 @@ #include <keyhi.h> #include <pk11pub.h> -#include <iostream> #include <list> #include "base/leak_annotations.h" diff --git a/base/crypto/rsa_private_key_win.cc b/base/crypto/rsa_private_key_win.cc index 40aa80a..b02ef3c 100644 --- a/base/crypto/rsa_private_key_win.cc +++ b/base/crypto/rsa_private_key_win.cc @@ -4,7 +4,6 @@ #include "base/crypto/rsa_private_key.h" -#include <iostream> #include <list> #include "base/logging.h" diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc index 7acf00c..7860111 100644 --- a/base/file_util_unittest.cc +++ b/base/file_util_unittest.cc @@ -13,7 +13,6 @@ #endif #include <fstream> -#include <iostream> #include <set> #include "base/base_paths.h" diff --git a/base/linked_ptr_unittest.cc b/base/linked_ptr_unittest.cc index d5e2d4d..f0b8989 100644 --- a/base/linked_ptr_unittest.cc +++ b/base/linked_ptr_unittest.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include <string> -#include <iostream> #include "base/linked_ptr.h" diff --git a/base/string_piece.cc b/base/string_piece.cc index 6844892..082e3c2 100644 --- a/base/string_piece.cc +++ b/base/string_piece.cc @@ -4,7 +4,7 @@ // Copied from strings/stringpiece.cc with modifications #include <algorithm> -#include <iostream> +#include <ostream> #include "base/string_piece.h" diff --git a/chrome/browser/cocoa/nsmenuitem_additions_unittest.mm b/chrome/browser/cocoa/nsmenuitem_additions_unittest.mm index 2be2a27..869cadeb 100644 --- a/chrome/browser/cocoa/nsmenuitem_additions_unittest.mm +++ b/chrome/browser/cocoa/nsmenuitem_additions_unittest.mm @@ -6,7 +6,7 @@ #include <Carbon/Carbon.h> -#include <iostream> +#include <ostream> #include "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" diff --git a/chrome/browser/parsers/metadata_parser_filebase.cc b/chrome/browser/parsers/metadata_parser_filebase.cc index ad92ea2..5b4aeff 100644 --- a/chrome/browser/parsers/metadata_parser_filebase.cc +++ b/chrome/browser/parsers/metadata_parser_filebase.cc @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <iostream> -#include <sstream> - #include "chrome/browser/parsers/metadata_parser_filebase.h" #include "base/file_util.h" diff --git a/chrome/browser/process_info_snapshot_mac.cc b/chrome/browser/process_info_snapshot_mac.cc index 4e2608b..732f22e 100644 --- a/chrome/browser/process_info_snapshot_mac.cc +++ b/chrome/browser/process_info_snapshot_mac.cc @@ -4,7 +4,6 @@ #include "chrome/browser/process_info_snapshot.h" -#include <iostream> #include <sstream> #include "base/logging.h" diff --git a/chrome/browser/safe_browsing/filter_false_positive_perftest.cc b/chrome/browser/safe_browsing/filter_false_positive_perftest.cc index ea913d8..fd58ea5 100644 --- a/chrome/browser/safe_browsing/filter_false_positive_perftest.cc +++ b/chrome/browser/safe_browsing/filter_false_positive_perftest.cc @@ -53,7 +53,6 @@ // unique views for the URL. #include <fstream> -#include <iostream> #include <vector> #include "base/command_line.h" diff --git a/chrome/browser/sync/syncable/syncable_unittest.cc b/chrome/browser/sync/syncable/syncable_unittest.cc index c8be9f4..6c5ceff 100644 --- a/chrome/browser/sync/syncable/syncable_unittest.cc +++ b/chrome/browser/sync/syncable/syncable_unittest.cc @@ -8,7 +8,6 @@ #include <sys/types.h> -#include <iostream> #include <limits> #include <string> diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc index b1333a2..c3bdb77 100644 --- a/chrome/common/logging_chrome.cc +++ b/chrome/common/logging_chrome.cc @@ -26,7 +26,6 @@ #include <windows.h> #endif -#include <iostream> #include <fstream> #include "chrome/common/logging_chrome.h" diff --git a/chrome/installer/util/copy_tree_work_item_unittest.cc b/chrome/installer/util/copy_tree_work_item_unittest.cc index d24d4ae..5668c37 100644 --- a/chrome/installer/util/copy_tree_work_item_unittest.cc +++ b/chrome/installer/util/copy_tree_work_item_unittest.cc @@ -5,7 +5,6 @@ #include <windows.h> #include <fstream> -#include <iostream> #include "base/base_paths.h" #include "base/file_util.h" diff --git a/chrome/installer/util/delete_tree_work_item_unittest.cc b/chrome/installer/util/delete_tree_work_item_unittest.cc index 645cea8..679fea6 100644 --- a/chrome/installer/util/delete_tree_work_item_unittest.cc +++ b/chrome/installer/util/delete_tree_work_item_unittest.cc @@ -5,7 +5,6 @@ #include <windows.h> #include <fstream> -#include <iostream> #include "base/base_paths.h" #include "base/file_util.h" diff --git a/chrome/installer/util/helper_unittest.cc b/chrome/installer/util/helper_unittest.cc index 05ca505..7604e49 100644 --- a/chrome/installer/util/helper_unittest.cc +++ b/chrome/installer/util/helper_unittest.cc @@ -5,7 +5,6 @@ #include <windows.h> #include <fstream> -#include <iostream> #include "base/base_paths.h" #include "base/file_util.h" diff --git a/chrome/installer/util/move_tree_work_item_unittest.cc b/chrome/installer/util/move_tree_work_item_unittest.cc index 8daa601..46dd415 100644 --- a/chrome/installer/util/move_tree_work_item_unittest.cc +++ b/chrome/installer/util/move_tree_work_item_unittest.cc @@ -5,7 +5,6 @@ #include <windows.h> #include <fstream> -#include <iostream> #include "base/base_paths.h" #include "base/file_util.h" diff --git a/chrome/installer/util/shell_util_unittest.cc b/chrome/installer/util/shell_util_unittest.cc index 143959a..ae74556 100644 --- a/chrome/installer/util/shell_util_unittest.cc +++ b/chrome/installer/util/shell_util_unittest.cc @@ -7,7 +7,6 @@ #include <shlobj.h> #include <fstream> -#include <iostream> #include "base/file_util.h" #include "base/path_service.h" diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc index e39d342..4966acf 100644 --- a/chrome/test/reliability/page_load_test.cc +++ b/chrome/test/reliability/page_load_test.cc @@ -35,7 +35,6 @@ // --savedebuglog: save Chrome, V8, and test debug log for each page loaded. #include <fstream> -#include <iostream> #include "base/command_line.h" #include "base/file_path.h" diff --git a/chrome/test/test_launcher/test_runner.cc b/chrome/test/test_launcher/test_runner.cc index a13519a..1b75318 100644 --- a/chrome/test/test_launcher/test_runner.cc +++ b/chrome/test/test_launcher/test_runner.cc @@ -4,7 +4,6 @@ #include "chrome/test/test_launcher/test_runner.h" -#include <iostream> #include <vector> #include "base/command_line.h" diff --git a/chrome/test/v8_unit_test.cc b/chrome/test/v8_unit_test.cc index 0ac6c1f..79dc887 100644 --- a/chrome/test/v8_unit_test.cc +++ b/chrome/test/v8_unit_test.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <iostream> - #include "base/string_util.h" #include "chrome/test/v8_unit_test.h" diff --git a/chrome/tools/crash_service/crash_service.cc b/chrome/tools/crash_service/crash_service.cc index 72d26d0..c062c04 100644 --- a/chrome/tools/crash_service/crash_service.cc +++ b/chrome/tools/crash_service/crash_service.cc @@ -6,7 +6,6 @@ #include <windows.h> -#include <iostream> #include <fstream> #include <map> #include <sddl.h> diff --git a/courgette/disassembler.cc b/courgette/disassembler.cc index 6395d18..57831cd 100644 --- a/courgette/disassembler.cc +++ b/courgette/disassembler.cc @@ -5,7 +5,6 @@ #include "courgette/disassembler.h" #include <algorithm> -#include <iostream> #include <string> #include <vector> diff --git a/gfx/insets_unittest.cc b/gfx/insets_unittest.cc index f08fc38..30d6d7f 100644 --- a/gfx/insets_unittest.cc +++ b/gfx/insets_unittest.cc @@ -4,8 +4,6 @@ #include "gfx/insets.h" -#include <iostream> - #include "testing/gtest/include/gtest/gtest.h" TEST(InsetsTest, InsetsDefault) { diff --git a/gfx/point.cc b/gfx/point.cc index 16a8216..d8b1e7b 100644 --- a/gfx/point.cc +++ b/gfx/point.cc @@ -8,7 +8,7 @@ #include <windows.h> #endif -#include <iostream> +#include <ostream> namespace gfx { diff --git a/gfx/rect.cc b/gfx/rect.cc index 7ff658f..6053b9e 100644 --- a/gfx/rect.cc +++ b/gfx/rect.cc @@ -12,7 +12,7 @@ #include <gdk/gdk.h> #endif -#include <iostream> +#include <ostream> #include "base/logging.h" #include "gfx/insets.h" diff --git a/gfx/size.cc b/gfx/size.cc index 90ff1da..9ef8c35 100644 --- a/gfx/size.cc +++ b/gfx/size.cc @@ -10,7 +10,7 @@ #include <CoreGraphics/CGGeometry.h> #endif -#include <iostream> +#include <ostream> #include "base/logging.h" diff --git a/ipc/ipc_fuzzing_tests.cc b/ipc/ipc_fuzzing_tests.cc index 951ccbb..37451f4b 100644 --- a/ipc/ipc_fuzzing_tests.cc +++ b/ipc/ipc_fuzzing_tests.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include <stdio.h> -#include <iostream> #include <string> #include <sstream> diff --git a/ipc/ipc_tests.cc b/ipc/ipc_tests.cc index a7546c3..f17fc18 100644 --- a/ipc/ipc_tests.cc +++ b/ipc/ipc_tests.cc @@ -12,7 +12,6 @@ #endif #include <stdio.h> -#include <iostream> #include <string> #include "ipc/ipc_tests.h" diff --git a/ipc/sync_socket_unittest.cc b/ipc/sync_socket_unittest.cc index e07fdf9..8681eb7 100644 --- a/ipc/sync_socket_unittest.cc +++ b/ipc/sync_socket_unittest.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include <stdio.h> -#include <iostream> #include <string> #include <sstream> diff --git a/net/base/x509_cert_types.cc b/net/base/x509_cert_types.cc index 8329216..8f7a2ae 100644 --- a/net/base/x509_cert_types.cc +++ b/net/base/x509_cert_types.cc @@ -4,6 +4,8 @@ #include "net/base/x509_cert_types.h" +#include <ostream> + #include "net/base/x509_certificate.h" #include "base/logging.h" diff --git a/net/base/x509_cert_types.h b/net/base/x509_cert_types.h index 0f5122e..ad3ea2d 100644 --- a/net/base/x509_cert_types.h +++ b/net/base/x509_cert_types.h @@ -8,7 +8,7 @@ #include <string.h> #include <functional> -#include <iostream> +#include <iosfwd> #include <map> #include <set> #include <string> diff --git a/net/tools/flip_server/balsa_frame.cc b/net/tools/flip_server/balsa_frame.cc index 90631ce..9b8173e 100644 --- a/net/tools/flip_server/balsa_frame.cc +++ b/net/tools/flip_server/balsa_frame.cc @@ -9,7 +9,6 @@ #include <strings.h> #include <limits> -#include <iostream> #include <string> #include <utility> #include <vector> diff --git a/net/tools/flip_server/balsa_headers.cc b/net/tools/flip_server/balsa_headers.cc index 56a83a2..b58fb03 100644 --- a/net/tools/flip_server/balsa_headers.cc +++ b/net/tools/flip_server/balsa_headers.cc @@ -71,6 +71,12 @@ namespace net { const size_t BalsaBuffer::kDefaultBlocksize; +std::ostream& BalsaHeaders::iterator_base::operator<<(std::ostream& os, + const iterator_base& it) { + os << "[" << it.headers_ << ", " << it.idx_ << "]"; + return os; + } + void BalsaHeaders::Clear() { balsa_buffer_.Clear(); transfer_encoding_is_chunked_ = false; diff --git a/net/tools/flip_server/balsa_headers.h b/net/tools/flip_server/balsa_headers.h index 4f530c7..24e7940 100644 --- a/net/tools/flip_server/balsa_headers.h +++ b/net/tools/flip_server/balsa_headers.h @@ -6,7 +6,7 @@ #define NET_TOOLS_FLIP_SERVER_BALSA_HEADERS_H_ #include <algorithm> -#include <iostream> +#include <iosfwd> #include <iterator> #include <string> #include <utility> @@ -470,10 +470,7 @@ class BalsaHeaders { // operator<< work for the classes it sees. It would be better if there // was an additional traits-like system for the gUnit output... but oh // well. - friend std::ostream& operator<<(std::ostream& os, const iterator_base& it) { - os << "[" << it.headers_ << ", " << it.idx_ << "]"; - return os; - } + std::ostream& operator<<(std::ostream& os, const iterator_base& it); protected: iterator_base(const BalsaHeaders* headers, HeaderLines::size_type index) : diff --git a/net/tools/flip_server/create_listener.cc b/net/tools/flip_server/create_listener.cc index 7ea5efa..3538261 100644 --- a/net/tools/flip_server/create_listener.cc +++ b/net/tools/flip_server/create_listener.cc @@ -10,6 +10,7 @@ #include <sys/socket.h> // for getaddrinfo and getnameinfo #include <sys/types.h> // " #include <unistd.h> // for exit() +#include <ostream> #include "net/tools/flip_server/create_listener.h" diff --git a/net/tools/flip_server/create_listener.h b/net/tools/flip_server/create_listener.h index 06979d9..32758ee 100644 --- a/net/tools/flip_server/create_listener.h +++ b/net/tools/flip_server/create_listener.h @@ -5,7 +5,7 @@ #ifndef NET_TOOLS_FLIP_SERVER_CREATE_LISTENER_H__ #define NET_TOOLS_FLIP_SERVER_CREATE_LISTENER_H__ -#include <iostream> +#include <iosfwd> #include <string> namespace net { diff --git a/sandbox/linux/seccomp/library.cc b/sandbox/linux/seccomp/library.cc index 68ff974..8dd9b93 100644 --- a/sandbox/linux/seccomp/library.cc +++ b/sandbox/linux/seccomp/library.cc @@ -8,7 +8,6 @@ #include <errno.h> #include <errno.h> #include <fcntl.h> -#include <iostream> #include <linux/unistd.h> #include <set> #include <signal.h> diff --git a/sandbox/linux/seccomp/maps.cc b/sandbox/linux/seccomp/maps.cc index d253c63..8ae218d 100644 --- a/sandbox/linux/seccomp/maps.cc +++ b/sandbox/linux/seccomp/maps.cc @@ -4,7 +4,6 @@ #include <errno.h> #include <fcntl.h> -#include <iostream> #include <linux/unistd.h> #include <signal.h> #include <stdarg.h> diff --git a/sandbox/linux/seccomp/sandbox_impl.h b/sandbox/linux/seccomp/sandbox_impl.h index ce2291c..4fe96cf 100644 --- a/sandbox/linux/seccomp/sandbox_impl.h +++ b/sandbox/linux/seccomp/sandbox_impl.h @@ -34,7 +34,6 @@ ({ typeof(x) i__; while ((i__ = (x)) < 0 && sys.my_errno == EINTR); i__;}) #ifdef __cplusplus -#include <iostream> #include <map> #include <vector> #include "sandbox.h" |