Remove <iostream> where possible.

<iostream> creates a static initializer. Most people don't need <iostream> anyway--they really need <ostream> for operator<< overloads. <iostream> should *never* be included in a header file; <iosfwd> exists for that purpose. BUG=none TEST=none Review URL: http://codereview.chromium.org/3014015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53083 0039d316-1c4b-4281-b951-d872f2087c98
FairyWorld · Jul 20, 2010 · f3b1afd · f3b1afd
1 parent e52162e
commit f3b1afd
Show file tree

Hide file tree

Showing 39 changed files with 18 additions and 44 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -8,7 +8,7 @@
 #include <windows.h>
 #endif
 
-#include <iostream>
+#include <ostream>
 
 namespace gfx {
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"