Move all objects from the spdy:: namespace to net::

Review URL: http://codereview.chromium.org/9815028

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

3 files changed, 30 insertions, 55 deletions

diff --git a/net/tools/flip_server/constants.h b/net/tools/flip_server/constants.h
index c0bc98c..a9fa3db 100644
--- a/net/tools/flip_server/constants.h
+++ b/net/tools/flip_server/constants.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,7 +9,7 @@
 
 const int kMSS = 1460;
 const int kSSLOverhead = 25;
-const int kSpdyOverhead = spdy::SpdyFrame::kHeaderSize;
+const int kSpdyOverhead = net::SpdyFrame::kHeaderSize;
 const int kInitialDataSendersThreshold = (2 * kMSS) - kSpdyOverhead;
 const int kSSLSegmentSize = (1 * kMSS) - kSSLOverhead;
 const int kSpdySegmentSize = kSSLSegmentSize - kSpdyOverhead;
diff --git a/net/tools/flip_server/spdy_interface.cc b/net/tools/flip_server/spdy_interface.cc
index 4638b1f..6ef3a2d 100644
--- a/net/tools/flip_server/spdy_interface.cc
+++ b/net/tools/flip_server/spdy_interface.cc
@@ -13,31 +13,6 @@
 #include "net/tools/flip_server/http_interface.h"
 #include "net/tools/flip_server/spdy_util.h"
 
-using spdy::kSpdyStreamMaximumWindowSize;
-using spdy::CONTROL_FLAG_NONE;
-using spdy::DATA_FLAG_COMPRESSED;
-using spdy::DATA_FLAG_FIN;
-using spdy::RST_STREAM;
-using spdy::SETTINGS_MAX_CONCURRENT_STREAMS;
-using spdy::SYN_REPLY;
-using spdy::SYN_STREAM;
-using spdy::BufferedSpdyFramer;
-using spdy::SettingsFlagsAndId;
-using spdy::SpdyControlFrame;
-using spdy::SpdySettingsControlFrame;
-using spdy::SpdyDataFlags;
-using spdy::SpdyDataFrame;
-using spdy::SpdyRstStreamControlFrame;
-using spdy::SpdyFrame;
-using spdy::SpdyFramer;
-using spdy::SpdyFramerVisitorInterface;
-using spdy::SpdyHeaderBlock;
-using spdy::SpdySetting;
-using spdy::SpdySettings;
-using spdy::SpdyStreamId;
-using spdy::SpdySynReplyControlFrame;
-using spdy::SpdySynStreamControlFrame;
-
 namespace net {
 
 // static
@@ -147,7 +122,7 @@ SMInterface* SpdySM::FindOrMakeNewSMConnectionInterface(
 
 int SpdySM::SpdyHandleNewStream(
     const SpdySynStreamControlFrame* syn_stream,
-    const linked_ptr<spdy::SpdyHeaderBlock>& headers,
+    const linked_ptr<SpdyHeaderBlock>& headers,
     std::string &http_data,
     bool* is_https_scheme) {
   *is_https_scheme = false;
@@ -226,8 +201,8 @@ void SpdySM::OnStreamFrameData(SpdyStreamId stream_id,
     interface->ProcessWriteInput(data, len);
 }
 
-void SpdySM::OnSynStream(const spdy::SpdySynStreamControlFrame& syn_stream,
-                         const linked_ptr<spdy::SpdyHeaderBlock>& headers) {
+void SpdySM::OnSynStream(const SpdySynStreamControlFrame& syn_stream,
+                         const linked_ptr<SpdyHeaderBlock>& headers) {
   std::string http_data;
   bool is_https_scheme;
   int ret = SpdyHandleNewStream(&syn_stream, headers, http_data,
@@ -259,21 +234,21 @@ void SpdySM::OnSynStream(const spdy::SpdySynStreamControlFrame& syn_stream,
   }
 }
 
-void SpdySM::OnSynReply(const spdy::SpdySynReplyControlFrame& frame,
-                        const linked_ptr<spdy::SpdyHeaderBlock>& headers) {
+void SpdySM::OnSynReply(const SpdySynReplyControlFrame& frame,
+                        const linked_ptr<SpdyHeaderBlock>& headers) {
   // TODO(willchan): if there is an error parsing headers, we
   // should send a RST_STREAM.
   VLOG(2) << ACCEPTOR_CLIENT_IDENT << "SpdySM: OnSynReply("
           << frame.stream_id() << ")";
 }
 
-void SpdySM::OnHeaders(const spdy::SpdyHeadersControlFrame& frame,
-                       const linked_ptr<spdy::SpdyHeaderBlock>& headers) {
+void SpdySM::OnHeaders(const SpdyHeadersControlFrame& frame,
+                       const linked_ptr<SpdyHeaderBlock>& headers) {
   VLOG(2) << ACCEPTOR_CLIENT_IDENT << "SpdySM: OnHeaders("
           << frame.stream_id() << ")";
 }
 
-void SpdySM::OnRstStream(const spdy::SpdyRstStreamControlFrame& frame) {
+void SpdySM::OnRstStream(const SpdyRstStreamControlFrame& frame) {
   VLOG(2) << ACCEPTOR_CLIENT_IDENT << "SpdySM: OnRstStream("
           << frame.stream_id() << ")";
   client_output_ordering_.RemoveStreamId(frame.stream_id());
diff --git a/net/tools/flip_server/spdy_interface.h b/net/tools/flip_server/spdy_interface.h
index 621a4ee..a53d577 100644
--- a/net/tools/flip_server/spdy_interface.h
+++ b/net/tools/flip_server/spdy_interface.h
@@ -23,7 +23,7 @@ namespace net {
 class FlipAcceptor;
 class MemoryCache;
 
-class SpdySM : public spdy::BufferedSpdyFramerVisitorInterface,
+class SpdySM : public BufferedSpdyFramerVisitorInterface,
                public SMInterface {
  public:
   SpdySM(SMConnection* connection,
@@ -55,35 +55,35 @@ class SpdySM : public spdy::BufferedSpdyFramerVisitorInterface,
   SMInterface* NewConnectionInterface();
   SMInterface* FindOrMakeNewSMConnectionInterface(std::string server_ip,
                                                   std::string server_port);
-  int SpdyHandleNewStream(const spdy::SpdySynStreamControlFrame* frame,
-                          const linked_ptr<spdy::SpdyHeaderBlock>& headers,
+  int SpdyHandleNewStream(const SpdySynStreamControlFrame* frame,
+                          const linked_ptr<SpdyHeaderBlock>& headers,
                           std::string& http_data,
                           bool* is_https_scheme);
 
   // BufferedSpdyFramerVisitorInterface:
   virtual void OnError(int error_code) OVERRIDE {}
-  virtual void OnStreamError(spdy::SpdyStreamId stream_id,
+  virtual void OnStreamError(SpdyStreamId stream_id,
                              const std::string& description) OVERRIDE {}
   virtual void OnRstStream(
-      const spdy::SpdyRstStreamControlFrame& frame) OVERRIDE;
-  virtual void OnGoAway(const spdy::SpdyGoAwayControlFrame& frame) OVERRIDE {}
-  virtual void OnPing(const spdy::SpdyPingControlFrame& frame) OVERRIDE {}
+      const SpdyRstStreamControlFrame& frame) OVERRIDE;
+  virtual void OnGoAway(const SpdyGoAwayControlFrame& frame) OVERRIDE {}
+  virtual void OnPing(const SpdyPingControlFrame& frame) OVERRIDE {}
   virtual void OnWindowUpdate(
-      const spdy::SpdyWindowUpdateControlFrame& frame) OVERRIDE {}
-  virtual void OnStreamFrameData(spdy::SpdyStreamId stream_id,
+      const SpdyWindowUpdateControlFrame& frame) OVERRIDE {}
+  virtual void OnStreamFrameData(SpdyStreamId stream_id,
                                  const char* data,
                                  size_t len) OVERRIDE;
   virtual void OnSetting(
-      spdy::SpdySettingsIds id, uint8 flags, uint32 value)  OVERRIDE {}
+      SpdySettingsIds id, uint8 flags, uint32 value)  OVERRIDE {}
   virtual void OnSynStream(
-      const spdy::SpdySynStreamControlFrame& frame,
-      const linked_ptr<spdy::SpdyHeaderBlock>& headers) OVERRIDE;
+      const SpdySynStreamControlFrame& frame,
+      const linked_ptr<SpdyHeaderBlock>& headers) OVERRIDE;
   virtual void OnSynReply(
-      const spdy::SpdySynReplyControlFrame& frame,
-      const linked_ptr<spdy::SpdyHeaderBlock>& headers) OVERRIDE;
+      const SpdySynReplyControlFrame& frame,
+      const linked_ptr<SpdyHeaderBlock>& headers) OVERRIDE;
   virtual void OnHeaders(
-      const spdy::SpdyHeadersControlFrame& frame,
-      const linked_ptr<spdy::SpdyHeaderBlock>& headers) OVERRIDE;
+      const SpdyHeadersControlFrame& frame,
+      const linked_ptr<SpdyHeaderBlock>& headers) OVERRIDE;
 
  public:
   virtual size_t ProcessReadInput(const char* data, size_t len) OVERRIDE;
@@ -116,7 +116,7 @@ class SpdySM : public spdy::BufferedSpdyFramerVisitorInterface,
                               const BalsaHeaders& headers) OVERRIDE;
   virtual void SendDataFrame(uint32 stream_id, const char* data, int64 len,
                              uint32 flags, bool compress) OVERRIDE;
-  spdy::BufferedSpdyFramer* spdy_framer() {
+  BufferedSpdyFramer* spdy_framer() {
       return buffered_spdy_framer_;
   }
 
@@ -130,16 +130,16 @@ class SpdySM : public spdy::BufferedSpdyFramerVisitorInterface,
   void SendErrorNotFoundImpl(uint32 stream_id);
   void SendOKResponseImpl(uint32 stream_id, std::string* output);
   void KillStream(uint32 stream_id);
-  void CopyHeaders(spdy::SpdyHeaderBlock& dest, const BalsaHeaders& headers);
+  void CopyHeaders(SpdyHeaderBlock& dest, const BalsaHeaders& headers);
   size_t SendSynStreamImpl(uint32 stream_id, const BalsaHeaders& headers);
   size_t SendSynReplyImpl(uint32 stream_id, const BalsaHeaders& headers);
   void SendDataFrameImpl(uint32 stream_id, const char* data, int64 len,
-                         spdy::SpdyDataFlags flags, bool compress);
+                         SpdyDataFlags flags, bool compress);
   void EnqueueDataFrame(DataFrame* df);
   virtual void GetOutput() OVERRIDE;
  private:
   uint64 seq_num_;
-  spdy::BufferedSpdyFramer* buffered_spdy_framer_;
+  BufferedSpdyFramer* buffered_spdy_framer_;
   bool valid_spdy_session_;  // True if we have seen valid data on this session.
                              // Use this to fail fast when junk is sent to our
                              // port.