Move NextProto enum to a new file net/socket/next_proto.h

net/socket/socket_test_util.h

Index: net/socket/socket_test_util.h
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index f678614f5625f57b6caef274ef3ca76e1d7879c4..2dfbe839c7f568ed62d173f2d03f324bfb0a524c 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -269,14 +269,14 @@ struct SSLSocketDataProvider {
   SSLSocketDataProvider(IoMode mode, int result);
   ~SSLSocketDataProvider();
 
-  void SetNextProto(SSLClientSocket::NextProto proto);
+  void SetNextProto(NextProto proto);
 
   MockConnect connect;
   SSLClientSocket::NextProtoStatus next_proto_status;
   std::string next_proto;
   std::string server_protos;
   bool was_npn_negotiated;
-  SSLClientSocket::NextProto protocol_negotiated;
+  NextProto protocol_negotiated;
   bool client_cert_sent;
   SSLCertRequestInfo* cert_request_info;
   scoped_refptr<X509Certificate> cert;
@@ -600,7 +600,7 @@ class MockClientSocket : public SSLClientSocket {
                                    const base::StringPiece& context,
                                    unsigned char* out,
                                    unsigned int outlen) OVERRIDE;
-  virtual NextProtoStatus GetNextProto(std::string* proto,
+  virtual SSLClientSocket::NextProtoStatus GetNextProto(std::string* proto,

[wtc, 2012/03/30 20:53:51]

Why is it necessary to add SSLClientSocket:: to the
NextProtoStatus type here?

If this change is not necessary, I'd prefer that we omit
SSLClientSocket:: for brevity.

Note that you made this change to several other files, too.

[Ryan Hamilton, 2012/03/30 21:12:13]

Whoops, I cooked up a script to help me with this change, and it looks like it
was overly aggressive.  I'll fix this.

                                        std::string* server_protos) OVERRIDE;
   virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE;
 
@@ -746,13 +746,13 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket {
   virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
   virtual void GetSSLCertRequestInfo(
       SSLCertRequestInfo* cert_request_info) OVERRIDE;
-  virtual NextProtoStatus GetNextProto(std::string* proto,
+  virtual SSLClientSocket::NextProtoStatus GetNextProto(std::string* proto,
                                        std::string* server_protos) OVERRIDE;
   virtual bool was_npn_negotiated() const OVERRIDE;
   virtual bool set_was_npn_negotiated(bool negotiated) OVERRIDE;
-  virtual SSLClientSocket::NextProto protocol_negotiated() const OVERRIDE;
+  virtual NextProto protocol_negotiated() const OVERRIDE;
   virtual void set_protocol_negotiated(
-      SSLClientSocket::NextProto protocol_negotiated) OVERRIDE;
+      NextProto protocol_negotiated) OVERRIDE;
 
   // This MockSocket does not implement the manual async IO feature.
   virtual void OnReadComplete(const MockRead& data) OVERRIDE;
@@ -774,7 +774,7 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket {
   bool new_npn_value_;
   bool was_used_to_convey_data_;
   bool is_protocol_negotiated_set_;
-  SSLClientSocket::NextProto protocol_negotiated_;
+  NextProto protocol_negotiated_;
 };
 
 class MockUDPClientSocket : public DatagramClientSocket,