Remove using namespace in net/quic/quic_stream_sequencer.h

Using namespace in a header file is very dangerous since then by
including that header in another file I will get the namespace
imported into that file as well, so remove that usage and modify
related files.

BUG=None
TEST=build all target

Review URL: https://codereview.chromium.org/763833003

Cr-Commit-Position: refs/heads/master@{#307211}

43 files changed, 86 insertions, 47 deletions

diff --git a/net/http/disk_cache_based_quic_server_info_unittest.cc b/net/http/disk_cache_based_quic_server_info_unittest.cc
index 847b3d8..17777e5 100644
--- a/net/http/disk_cache_based_quic_server_info_unittest.cc
+++ b/net/http/disk_cache_based_quic_server_info_unittest.cc
@@ -14,6 +14,8 @@
 #include "net/quic/quic_server_id.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using std::string;
+
 namespace net {
 namespace {
 
diff --git a/net/quic/congestion_control/send_algorithm_simulator.cc b/net/quic/congestion_control/send_algorithm_simulator.cc
index 7653943..eedebe53 100644
--- a/net/quic/congestion_control/send_algorithm_simulator.cc
+++ b/net/quic/congestion_control/send_algorithm_simulator.cc
@@ -14,6 +14,7 @@ using std::list;
 using std::make_pair;
 using std::max;
 using std::min;
+using std::string;
 using std::vector;
 
 namespace net {
diff --git a/net/quic/congestion_control/send_algorithm_simulator.h b/net/quic/congestion_control/send_algorithm_simulator.h
index 7f52d8f..2685d23 100644
--- a/net/quic/congestion_control/send_algorithm_simulator.h
+++ b/net/quic/congestion_control/send_algorithm_simulator.h
@@ -80,7 +80,7 @@ class SendAlgorithmSimulator {
     Transfer(Sender* sender,
              QuicByteCount num_bytes,
              QuicTime start_time,
-             string name);
+             std::string name);
 
     Sender* sender;
     QuicByteCount num_bytes;
@@ -88,7 +88,7 @@ class SendAlgorithmSimulator {
     QuicByteCount bytes_lost;
     QuicByteCount bytes_in_flight;
     QuicTime start_time;
-    string name;
+    std::string name;
   };
 
   struct SentPacket {
@@ -157,8 +157,10 @@ class SendAlgorithmSimulator {
   void AddTransfer(Sender* sender, size_t num_bytes);
 
   // Adds a pending sending to start at the specified time.
-  void AddTransfer(
-      Sender* sender, size_t num_bytes, QuicTime start_time, string name);
+  void AddTransfer(Sender* sender,
+                   size_t num_bytes,
+                   QuicTime start_time,
+                   std::string name);
 
   // Convenience method to transfer all bytes.
   void TransferBytes();
diff --git a/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc b/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
index 37ee8f9..037bf7e 100644
--- a/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
+++ b/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
@@ -7,6 +7,7 @@
 #include "net/quic/test_tools/quic_test_utils.h"
 
 using base::StringPiece;
+using std::string;
 
 namespace {
 
diff --git a/net/quic/crypto/aes_128_gcm_12_encrypter_test.cc b/net/quic/crypto/aes_128_gcm_12_encrypter_test.cc
index 8ccaaed..b7345b5 100644
--- a/net/quic/crypto/aes_128_gcm_12_encrypter_test.cc
+++ b/net/quic/crypto/aes_128_gcm_12_encrypter_test.cc
@@ -7,6 +7,7 @@
 #include "net/quic/test_tools/quic_test_utils.h"
 
 using base::StringPiece;
+using std::string;
 
 namespace {
 
diff --git a/net/quic/crypto/chacha20_poly1305_decrypter_test.cc b/net/quic/crypto/chacha20_poly1305_decrypter_test.cc
index e83acc0..312e2d4 100644
--- a/net/quic/crypto/chacha20_poly1305_decrypter_test.cc
+++ b/net/quic/crypto/chacha20_poly1305_decrypter_test.cc
@@ -7,6 +7,7 @@
 #include "net/quic/test_tools/quic_test_utils.h"
 
 using base::StringPiece;
+using std::string;
 
 namespace {
 
diff --git a/net/quic/crypto/chacha20_poly1305_encrypter_test.cc b/net/quic/crypto/chacha20_poly1305_encrypter_test.cc
index 4f33337..5b05c7f 100644
--- a/net/quic/crypto/chacha20_poly1305_encrypter_test.cc
+++ b/net/quic/crypto/chacha20_poly1305_encrypter_test.cc
@@ -7,6 +7,7 @@
 #include "net/quic/test_tools/quic_test_utils.h"
 
 using base::StringPiece;
+using std::string;
 
 namespace {
 
diff --git a/net/quic/crypto/crypto_utils_test.cc b/net/quic/crypto/crypto_utils_test.cc
index 882a9b5..1395cc3 100644
--- a/net/quic/crypto/crypto_utils_test.cc
+++ b/net/quic/crypto/crypto_utils_test.cc
@@ -7,6 +7,8 @@
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using std::string;
+
 namespace net {
 namespace test {
 namespace {
diff --git a/net/quic/quic_connection_test.cc b/net/quic/quic_connection_test.cc
index 9d9a506..cb46bd9 100644
--- a/net/quic/quic_connection_test.cc
+++ b/net/quic/quic_connection_test.cc
@@ -31,6 +31,7 @@
 
 using base::StringPiece;
 using std::map;
+using std::string;
 using std::vector;
 using testing::AnyNumber;
 using testing::AtLeast;
diff --git a/net/quic/quic_crypto_client_stream.cc b/net/quic/quic_crypto_client_stream.cc
index fd740dd..6777b2e 100644
--- a/net/quic/quic_crypto_client_stream.cc
+++ b/net/quic/quic_crypto_client_stream.cc
@@ -12,6 +12,8 @@
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_session.h"
 
+using std::string;
+
 namespace net {
 
 QuicCryptoClientStream::ChannelIDSourceCallbackImpl::
diff --git a/net/quic/quic_crypto_client_stream.h b/net/quic/quic_crypto_client_stream.h
index f2a4244..ae9304c 100644
--- a/net/quic/quic_crypto_client_stream.h
+++ b/net/quic/quic_crypto_client_stream.h
@@ -81,7 +81,7 @@ class NET_EXPORT_PRIVATE QuicCryptoClientStream : public QuicCryptoStream {
 
     // ProofVerifierCallback interface.
     void Run(bool ok,
-             const string& error_details,
+             const std::string& error_details,
              scoped_ptr<ProofVerifyDetails>* details) override;
 
     // Cancel causes any future callbacks to be ignored. It must be called on
@@ -208,7 +208,7 @@ class NET_EXPORT_PRIVATE QuicCryptoClientStream : public QuicCryptoStream {
   // verification. These members must not be used after
   // STATE_VERIFY_PROOF_COMPLETE.
   bool verify_ok_;
-  string verify_error_details_;
+  std::string verify_error_details_;
   scoped_ptr<ProofVerifyDetails> verify_details_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicCryptoClientStream);
diff --git a/net/quic/quic_crypto_client_stream_test.cc b/net/quic/quic_crypto_client_stream_test.cc
index a39df4f..584b6fb 100644
--- a/net/quic/quic_crypto_client_stream_test.cc
+++ b/net/quic/quic_crypto_client_stream_test.cc
@@ -18,6 +18,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using std::string;
+
 namespace net {
 namespace test {
 namespace {
diff --git a/net/quic/quic_crypto_server_stream.cc b/net/quic/quic_crypto_server_stream.cc
index c4b5893..baf8a93 100644
--- a/net/quic/quic_crypto_server_stream.cc
+++ b/net/quic/quic_crypto_server_stream.cc
@@ -15,6 +15,8 @@
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_session.h"
 
+using std::string;
+
 namespace net {
 
 void ServerHelloNotifier::OnAckNotification(
diff --git a/net/quic/quic_crypto_server_stream_test.cc b/net/quic/quic_crypto_server_stream_test.cc
index f3ea48a..ebb5af2 100644
--- a/net/quic/quic_crypto_server_stream_test.cc
+++ b/net/quic/quic_crypto_server_stream_test.cc
@@ -32,6 +32,7 @@ class ReliableQuicStream;
 }  // namespace net
 
 using std::pair;
+using std::string;
 using testing::_;
 
 namespace net {
diff --git a/net/quic/quic_data_stream.h b/net/quic/quic_data_stream.h
index 0337b30..965a5ae 100644
--- a/net/quic/quic_data_stream.h
+++ b/net/quic/quic_data_stream.h
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 
 #include <list>
+#include <string>
 
 #include "base/basictypes.h"
 #include "base/strings/string_piece.h"
@@ -133,7 +134,7 @@ class NET_EXPORT_PRIVATE QuicDataStream : public ReliableQuicStream {
   QuicPriority priority_;
   // Contains a copy of the decompressed headers until they are consumed
   // via ProcessData or Readv.
-  string decompressed_headers_;
+  std::string decompressed_headers_;
   // True if an error was encountered during decompression.
   bool decompression_failed_;
   // True if the priority has been read, false otherwise.
diff --git a/net/quic/quic_data_stream_test.cc b/net/quic/quic_data_stream_test.cc
index 16e6341..cc865c0 100644
--- a/net/quic/quic_data_stream_test.cc
+++ b/net/quic/quic_data_stream_test.cc
@@ -18,6 +18,7 @@
 
 using base::StringPiece;
 using std::min;
+using std::string;
 using testing::AnyNumber;
 using testing::InSequence;
 using testing::Return;
diff --git a/net/quic/quic_headers_stream.cc b/net/quic/quic_headers_stream.cc
index 10a02a7..9d26e4a 100644
--- a/net/quic/quic_headers_stream.cc
+++ b/net/quic/quic_headers_stream.cc
@@ -7,6 +7,7 @@
 #include "net/quic/quic_session.h"
 
 using base::StringPiece;
+using std::string;
 
 namespace net {
 
diff --git a/net/quic/quic_reliable_client_stream_test.cc b/net/quic/quic_reliable_client_stream_test.cc
index caa697a..4da460c 100644
--- a/net/quic/quic_reliable_client_stream_test.cc
+++ b/net/quic/quic_reliable_client_stream_test.cc
@@ -90,7 +90,7 @@ INSTANTIATE_TEST_CASE_P(Version, QuicReliableClientStreamTest,
 
 TEST_P(QuicReliableClientStreamTest, OnFinRead) {
   InitializeHeaders();
-  string uncompressed_headers =
+  std::string uncompressed_headers =
       SpdyUtils::SerializeUncompressedHeaders(headers_);
   EXPECT_CALL(delegate_, OnDataReceived(StrEq(uncompressed_headers.data()),
                                         uncompressed_headers.size()));
diff --git a/net/quic/quic_server_session.h b/net/quic/quic_server_session.h
index 43107a0..5614b21 100644
--- a/net/quic/quic_server_session.h
+++ b/net/quic/quic_server_session.h
@@ -8,6 +8,7 @@
 #define NET_QUIC_QUIC_SERVER_SESSION_H_
 
 #include <set>
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ -67,7 +68,7 @@ class QuicServerSession : public QuicSession {
   // Override base class to process FEC config received from client.
   void OnConfigNegotiated() override;
 
-  void set_serving_region(string serving_region) {
+  void set_serving_region(std::string serving_region) {
     serving_region_ = serving_region;
   }
 
@@ -96,7 +97,7 @@ class QuicServerSession : public QuicSession {
 
   // Text describing server location. Sent to the client as part of the bandwith
   // estimate in the source-address token. Optional, can be left empty.
-  string serving_region_;
+  std::string serving_region_;
 
   // Time at which we send the last SCUP to the client.
   QuicTime last_scup_time_;
diff --git a/net/quic/quic_session.cc b/net/quic/quic_session.cc
index f05395e..1efefda 100644
--- a/net/quic/quic_session.cc
+++ b/net/quic/quic_session.cc
@@ -15,7 +15,9 @@ using base::StringPiece;
 using base::hash_map;
 using base::hash_set;
 using std::make_pair;
+using std::map;
 using std::max;
+using std::string;
 using std::vector;
 
 namespace net {
diff --git a/net/quic/quic_session.h b/net/quic/quic_session.h
index 7bc743a..3339d42 100644
--- a/net/quic/quic_session.h
+++ b/net/quic/quic_session.h
@@ -7,6 +7,8 @@
 #ifndef NET_QUIC_QUIC_SESSION_H_
 #define NET_QUIC_QUIC_SESSION_H_
 
+#include <map>
+#include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
diff --git a/net/quic/quic_session_test.cc b/net/quic/quic_session_test.cc
index d953678..e404929 100644
--- a/net/quic/quic_session_test.cc
+++ b/net/quic/quic_session_test.cc
@@ -5,7 +5,6 @@
 #include "net/quic/quic_session.h"
 
 #include <set>
-#include <vector>
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
@@ -33,6 +32,7 @@
 
 using base::hash_map;
 using std::set;
+using std::string;
 using std::vector;
 using testing::CreateFunctor;
 using testing::InSequence;
diff --git a/net/quic/quic_spdy_server_stream.h b/net/quic/quic_spdy_server_stream.h
index 54506d1..a8bd9f3 100644
--- a/net/quic/quic_spdy_server_stream.h
+++ b/net/quic/quic_spdy_server_stream.h
@@ -51,7 +51,7 @@ class QuicSpdyServerStream : public QuicDataStream {
                           base::StringPiece body);
 
   SpdyHeaderBlock headers_;
-  string body_;
+  std::string body_;
   GURL request_url_;
 
   // Buffer into which response header data is read.
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index e7612a0..9625d0d 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -40,9 +40,6 @@
 #include "base/win/windows_version.h"
 #endif
 
-using std::string;
-using std::vector;
-
 namespace net {
 
 namespace {
diff --git a/net/quic/quic_stream_sequencer.cc b/net/quic/quic_stream_sequencer.cc
index 153e6cf..ceeaa94 100644
--- a/net/quic/quic_stream_sequencer.cc
+++ b/net/quic/quic_stream_sequencer.cc
@@ -14,6 +14,7 @@
 using std::make_pair;
 using std::min;
 using std::numeric_limits;
+using std::string;
 
 namespace net {
 
diff --git a/net/quic/quic_stream_sequencer.h b/net/quic/quic_stream_sequencer.h
index 5da2c0e..025dca4 100644
--- a/net/quic/quic_stream_sequencer.h
+++ b/net/quic/quic_stream_sequencer.h
@@ -6,14 +6,12 @@
 #define NET_QUIC_QUIC_STREAM_SEQUENCER_H_
 
 #include <map>
+#include <string>
 
 #include "base/basictypes.h"
 #include "net/base/iovec.h"
 #include "net/quic/quic_protocol.h"
 
-using std::map;
-using std::string;
-
 namespace net {
 
 namespace test {
@@ -103,7 +101,7 @@ class NET_EXPORT_PRIVATE QuicStreamSequencer {
   // frames, in which case we will have to allow receipt of overlapping frames.
   // Maybe write new frames into a ring buffer, and keep track of consumed
   // bytes, and gaps.
-  typedef map<QuicStreamOffset, string> FrameMap;
+  typedef std::map<QuicStreamOffset, std::string> FrameMap;
 
   // Stores buffered frames (maps from sequence number -> frame data as string).
   FrameMap buffered_frames_;
diff --git a/net/quic/quic_stream_sequencer_test.cc b/net/quic/quic_stream_sequencer_test.cc
index 43a105b..8a71c4c 100644
--- a/net/quic/quic_stream_sequencer_test.cc
+++ b/net/quic/quic_stream_sequencer_test.cc
@@ -22,6 +22,7 @@ using base::StringPiece;
 using std::map;
 using std::min;
 using std::pair;
+using std::string;
 using std::vector;
 using testing::_;
 using testing::AnyNumber;
diff --git a/net/quic/reliable_quic_stream.cc b/net/quic/reliable_quic_stream.cc
index 116d843..a4b90b7 100644
--- a/net/quic/reliable_quic_stream.cc
+++ b/net/quic/reliable_quic_stream.cc
@@ -12,6 +12,7 @@
 
 using base::StringPiece;
 using std::min;
+using std::string;
 
 namespace net {
 
diff --git a/net/quic/reliable_quic_stream.h b/net/quic/reliable_quic_stream.h
index 698fefb..1de6004 100644
--- a/net/quic/reliable_quic_stream.h
+++ b/net/quic/reliable_quic_stream.h
@@ -10,6 +10,7 @@
 #include <sys/types.h>
 
 #include <list>
+#include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ -67,7 +68,7 @@ class NET_EXPORT_PRIVATE ReliableQuicStream {
   // Called to close the entire connection from this end.
   virtual void CloseConnection(QuicErrorCode error);
   virtual void CloseConnectionWithDetails(QuicErrorCode error,
-                                          const string& details);
+                                          const std::string& details);
 
   // Returns the effective priority for the stream.  This value may change
   // during the life of the stream.
@@ -181,11 +182,11 @@ class NET_EXPORT_PRIVATE ReliableQuicStream {
   class ProxyAckNotifierDelegate;
 
   struct PendingData {
-    PendingData(string data_in,
+    PendingData(std::string data_in,
                 scoped_refptr<ProxyAckNotifierDelegate> delegate_in);
     ~PendingData();
 
-    string data;
+    std::string data;
     // Delegate that should be notified when the pending data is acked.
     // Can be nullptr.
     scoped_refptr<ProxyAckNotifierDelegate> delegate;
diff --git a/net/quic/reliable_quic_stream_test.cc b/net/quic/reliable_quic_stream_test.cc
index d63a5d8..4a77aa0 100644
--- a/net/quic/reliable_quic_stream_test.cc
+++ b/net/quic/reliable_quic_stream_test.cc
@@ -21,6 +21,7 @@
 
 using base::StringPiece;
 using std::min;
+using std::string;
 using testing::CreateFunctor;
 using testing::InSequence;
 using testing::Invoke;
diff --git a/net/quic/test_tools/mock_crypto_client_stream.cc b/net/quic/test_tools/mock_crypto_client_stream.cc
index eef3b80..b45d371 100644
--- a/net/quic/test_tools/mock_crypto_client_stream.cc
+++ b/net/quic/test_tools/mock_crypto_client_stream.cc
@@ -9,6 +9,8 @@
 #include "net/quic/quic_server_id.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using std::string;
+
 namespace net {
 
 MockCryptoClientStream::MockCryptoClientStream(
diff --git a/net/quic/test_tools/quic_session_peer.cc b/net/quic/test_tools/quic_session_peer.cc
index 14897b2..7dd7b66 100644
--- a/net/quic/test_tools/quic_session_peer.cc
+++ b/net/quic/test_tools/quic_session_peer.cc
@@ -7,6 +7,8 @@
 #include "net/quic/quic_session.h"
 #include "net/quic/reliable_quic_stream.h"
 
+using std::map;
+
 namespace net {
 namespace test {
 
diff --git a/net/quic/test_tools/quic_session_peer.h b/net/quic/test_tools/quic_session_peer.h
index e69f6ba..4a88c88 100644
--- a/net/quic/test_tools/quic_session_peer.h
+++ b/net/quic/test_tools/quic_session_peer.h
@@ -5,6 +5,8 @@
 #ifndef NET_QUIC_TEST_TOOLS_QUIC_SESSION_PEER_H_
 #define NET_QUIC_TEST_TOOLS_QUIC_SESSION_PEER_H_
 
+#include <map>
+
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_write_blocked_list.h"
 
diff --git a/net/quic/test_tools/quic_test_utils.h b/net/quic/test_tools/quic_test_utils.h
index 6b6efe3..980132d 100644
--- a/net/quic/test_tools/quic_test_utils.h
+++ b/net/quic/test_tools/quic_test_utils.h
@@ -304,16 +304,17 @@ class MockConnection : public QuicConnection {
                                       const IPEndPoint& peer_address,
                                       const QuicEncryptedPacket& packet));
   MOCK_METHOD1(SendConnectionClose, void(QuicErrorCode error));
-  MOCK_METHOD2(SendConnectionCloseWithDetails, void(QuicErrorCode error,
-                                                    const string& details));
-  MOCK_METHOD2(SendConnectionClosePacket, void(QuicErrorCode error,
-                                               const string& details));
+  MOCK_METHOD2(SendConnectionCloseWithDetails,
+               void(QuicErrorCode error, const std::string& details));
+  MOCK_METHOD2(SendConnectionClosePacket,
+               void(QuicErrorCode error, const std::string& details));
   MOCK_METHOD3(SendRstStream, void(QuicStreamId id,
                                    QuicRstStreamErrorCode error,
                                    QuicStreamOffset bytes_written));
-  MOCK_METHOD3(SendGoAway, void(QuicErrorCode error,
-                                QuicStreamId last_good_stream_id,
-                                const string& reason));
+  MOCK_METHOD3(SendGoAway,
+               void(QuicErrorCode error,
+                    QuicStreamId last_good_stream_id,
+                    const std::string& reason));
   MOCK_METHOD1(SendBlocked, void(QuicStreamId id));
   MOCK_METHOD2(SendWindowUpdate, void(QuicStreamId id,
                                       QuicStreamOffset byte_offset));
diff --git a/net/tools/quic/quic_client.h b/net/tools/quic/quic_client.h
index b983119c..c095a4d 100644
--- a/net/tools/quic/quic_client.h
+++ b/net/tools/quic/quic_client.h
@@ -44,7 +44,7 @@ class QuicClient : public EpollCallbackInterface,
     virtual ~ResponseListener() {}
     virtual void OnCompleteResponse(QuicStreamId id,
                                     const BalsaHeaders& response_headers,
-                                    const string& response_body) = 0;
+                                    const std::string& response_body) = 0;
   };
 
   // Create a quic client, which will have events managed by an externally owned
@@ -143,7 +143,7 @@ class QuicClient : public EpollCallbackInterface,
     server_id_ = server_id;
   }
 
-  void SetUserAgentID(const string& user_agent_id) {
+  void SetUserAgentID(const std::string& user_agent_id) {
     crypto_config_.set_user_agent_id(user_agent_id);
   }
 
diff --git a/net/tools/quic/quic_dispatcher_test.cc b/net/tools/quic/quic_dispatcher_test.cc
index 45cddb0..fc1e10d 100644
--- a/net/tools/quic/quic_dispatcher_test.cc
+++ b/net/tools/quic/quic_dispatcher_test.cc
@@ -29,6 +29,7 @@ using net::test::MockSession;
 using net::test::ValueRestore;
 using net::tools::test::MockConnection;
 using std::make_pair;
+using std::string;
 using testing::DoAll;
 using testing::InSequence;
 using testing::Invoke;
diff --git a/net/tools/quic/quic_server_session.h b/net/tools/quic/quic_server_session.h
index 603ad35..81cae12 100644
--- a/net/tools/quic/quic_server_session.h
+++ b/net/tools/quic/quic_server_session.h
@@ -8,6 +8,7 @@
 #define NET_TOOLS_QUIC_QUIC_SERVER_SESSION_H_
 
 #include <set>
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ -68,7 +69,7 @@ class QuicServerSession : public QuicSession {
   // Override base class to process FEC config received from client.
   void OnConfigNegotiated() override;
 
-  void set_serving_region(string serving_region) {
+  void set_serving_region(std::string serving_region) {
     serving_region_ = serving_region;
   }
 
@@ -97,7 +98,7 @@ class QuicServerSession : public QuicSession {
 
   // Text describing server location. Sent to the client as part of the bandwith
   // estimate in the source-address token. Optional, can be left empty.
-  string serving_region_;
+  std::string serving_region_;
 
   // Time at which we send the last SCUP to the client.
   QuicTime last_scup_time_;
diff --git a/net/tools/quic/quic_server_session_test.cc b/net/tools/quic/quic_server_session_test.cc
index 94ed5d8..c8f8bce 100644
--- a/net/tools/quic/quic_server_session_test.cc
+++ b/net/tools/quic/quic_server_session_test.cc
@@ -37,6 +37,7 @@ using net::test::kClientDataStreamId1;
 using net::test::kClientDataStreamId2;
 using net::test::kClientDataStreamId3;
 using net::test::kClientDataStreamId4;
+using std::string;
 using testing::StrictMock;
 using testing::_;
 
diff --git a/net/tools/quic/quic_spdy_client_stream_test.cc b/net/tools/quic/quic_spdy_client_stream_test.cc
index 090e2da..94ba5aa 100644
--- a/net/tools/quic/quic_spdy_client_stream_test.cc
+++ b/net/tools/quic/quic_spdy_client_stream_test.cc
@@ -16,6 +16,7 @@
 
 using net::test::DefaultQuicConfig;
 using net::test::SupportedVersions;
+using std::string;
 using testing::StrictMock;
 using testing::TestWithParam;
 
diff --git a/net/tools/quic/quic_spdy_server_stream.h b/net/tools/quic/quic_spdy_server_stream.h
index feb809f..6fa1114 100644
--- a/net/tools/quic/quic_spdy_server_stream.h
+++ b/net/tools/quic/quic_spdy_server_stream.h
@@ -52,7 +52,7 @@ class QuicSpdyServerStream : public QuicDataStream {
                           base::StringPiece body);
 
   BalsaHeaders headers_;
-  string body_;
+  std::string body_;
 
   // Buffer into which response header data is read.
   scoped_refptr<GrowableIOBuffer> read_buf_;
diff --git a/net/tools/quic/test_tools/packet_dropping_test_writer.h b/net/tools/quic/test_tools/packet_dropping_test_writer.h
index 842d70e..6dcb1b9 100644
--- a/net/tools/quic/test_tools/packet_dropping_test_writer.h
+++ b/net/tools/quic/test_tools/packet_dropping_test_writer.h
@@ -6,6 +6,7 @@
 #define NET_TOOLS_QUIC_TEST_TOOLS_PACKET_DROPPING_TEST_WRITER_H_
 
 #include <list>
+#include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ -123,7 +124,7 @@ class PacketDroppingTestWriter : public QuicPacketWriterWrapper {
                  QuicTime send_time);
     ~DelayedWrite();
 
-    string buffer;
+    std::string buffer;
     const IPAddressNumber self_address;
     const IPEndPoint peer_address;
     QuicTime send_time;
diff --git a/net/tools/quic/test_tools/quic_test_client.h b/net/tools/quic/test_tools/quic_test_client.h
index a1dea9e..79224ba 100644
--- a/net/tools/quic/test_tools/quic_test_client.h
+++ b/net/tools/quic/test_tools/quic_test_client.h
@@ -63,11 +63,11 @@ class QuicTestClient : public SimpleClient,
                        public QuicDataStream::Visitor {
  public:
   QuicTestClient(IPEndPoint server_address,
-                 const string& server_hostname,
+                 const std::string& server_hostname,
                  bool secure,
                  const QuicVersionVector& supported_versions);
   QuicTestClient(IPEndPoint server_address,
-                 const string& server_hostname,
+                 const std::string& server_hostname,
                  bool secure,
                  const QuicConfig& config,
                  const QuicVersionVector& supported_versions);
@@ -80,18 +80,18 @@ class QuicTestClient : public SimpleClient,
   void ExpectCertificates(bool on);
 
   // Sets the |user_agent_id| of the |client_|.
-  void SetUserAgentID(const string& user_agent_id);
+  void SetUserAgentID(const std::string& user_agent_id);
 
   // Wraps data in a quic packet and sends it.
-  ssize_t SendData(string data, bool last_data);
+  ssize_t SendData(std::string data, bool last_data);
 
   // From SimpleClient
   // Clears any outstanding state and sends a simple GET of 'uri' to the
   // server.  Returns 0 if the request failed and no bytes were written.
-  ssize_t SendRequest(const string& uri) override;
+  ssize_t SendRequest(const std::string& uri) override;
   ssize_t SendMessage(const HTTPMessage& message) override;
-  string SendCustomSynchronousRequest(const HTTPMessage& message) override;
-  string SendSynchronousRequest(const string& uri) override;
+  std::string SendCustomSynchronousRequest(const HTTPMessage& message) override;
+  std::string SendSynchronousRequest(const std::string& uri) override;
   void Connect() override;
   void ResetConnection() override;
   void Disconnect() override;
@@ -111,13 +111,13 @@ class QuicTestClient : public SimpleClient,
   bool buffer_body() const override;
   void set_buffer_body(bool buffer_body) override;
   bool ServerInLameDuckMode() const override;
-  const string& response_body() override;
+  const std::string& response_body() override;
   bool connected() const override;
   // These functions are all unimplemented functions from SimpleClient, and log
   // DFATAL if called by users of SimpleClient.
   ssize_t SendAndWaitForResponse(const void* buffer, size_t size) override;
   void Bind(IPEndPoint* local_address) override;
-  string SerializeMessage(const HTTPMessage& message) override;
+  std::string SerializeMessage(const HTTPMessage& message) override;
   IPAddressNumber bind_to_address() const override;
   void set_bind_to_address(IPAddressNumber address) override;
   const IPEndPoint& address() const override;
@@ -143,7 +143,7 @@ class QuicTestClient : public SimpleClient,
 
   // cert_common_name returns the common name value of the server's certificate,
   // or the empty string if no certificate was presented.
-  const string& cert_common_name() const;
+  const std::string& cert_common_name() const;
 
   // Get the server config map.
   QuicTagValueMap GetServerConfig() const;
@@ -178,7 +178,7 @@ class QuicTestClient : public SimpleClient,
   bool response_headers_complete_;
   BalsaHeaders headers_;
   QuicPriority priority_;
-  string response_;
+  std::string response_;
   uint64 bytes_read_;
   uint64 bytes_written_;
   // The number of uncompressed HTTP header bytes received.
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 39b5979..099a319 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -10,7 +10,6 @@
 #endif
 
 #include <algorithm>
-#include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ -99,6 +98,7 @@
 
 using base::ASCIIToUTF16;
 using base::Time;
+using std::string;
 
 namespace net {