Merge Chromium at r10.0.634.0: Initial merge by git.

Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c

4 files changed, 9 insertions, 6 deletions

diff --git a/net/websockets/websocket.h b/net/websockets/websocket.h
index c729afc..ec1297a 100644
--- a/net/websockets/websocket.h
+++ b/net/websockets/websocket.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 //
@@ -74,7 +74,7 @@ class WebSocket : public base::RefCountedThreadSafe<WebSocket>,
     Request(const GURL& url, const std::string protocol,
             const std::string origin, const std::string location,
             ProtocolVersion version,
-            URLRequestContext* context)
+            net::URLRequestContext* context)
         : url_(url),
           protocol_(protocol),
           origin_(origin),
@@ -90,7 +90,7 @@ class WebSocket : public base::RefCountedThreadSafe<WebSocket>,
     const std::string& origin() const { return origin_; }
     const std::string& location() const { return location_; }
     ProtocolVersion version() const { return version_; }
-    URLRequestContext* context() const { return context_; }
+    net::URLRequestContext* context() const { return context_; }
 
     // Sets an alternative HostResolver. For testing purposes only.
     void SetHostResolver(HostResolver* host_resolver) {
@@ -113,7 +113,7 @@ class WebSocket : public base::RefCountedThreadSafe<WebSocket>,
     std::string origin_;
     std::string location_;
     ProtocolVersion version_;
-    scoped_refptr<URLRequestContext> context_;
+    scoped_refptr<net::URLRequestContext> context_;
 
     HostResolver* host_resolver_;
     ClientSocketFactory* client_socket_factory_;
diff --git a/net/websockets/websocket_handshake_handler.cc b/net/websockets/websocket_handshake_handler.cc
index 57f01e9..734b93e 100644
--- a/net/websockets/websocket_handshake_handler.cc
+++ b/net/websockets/websocket_handshake_handler.cc
@@ -284,6 +284,8 @@ WebSocketHandshakeResponseHandler::WebSocketHandshakeResponseHandler()
     : original_header_length_(0) {
 }
 
+WebSocketHandshakeResponseHandler::~WebSocketHandshakeResponseHandler() {}
+
 size_t WebSocketHandshakeResponseHandler::ParseRawResponse(
     const char* data, int length) {
   DCHECK_GT(length, 0);
diff --git a/net/websockets/websocket_handshake_handler.h b/net/websockets/websocket_handshake_handler.h
index 5455444..b191dba 100644
--- a/net/websockets/websocket_handshake_handler.h
+++ b/net/websockets/websocket_handshake_handler.h
@@ -71,7 +71,7 @@ class WebSocketHandshakeRequestHandler {
 class WebSocketHandshakeResponseHandler {
  public:
   WebSocketHandshakeResponseHandler();
-  ~WebSocketHandshakeResponseHandler() {}
+  ~WebSocketHandshakeResponseHandler();
 
   // Parses WebSocket handshake response from WebSocket server.
   // Returns number of bytes in |data| used for WebSocket handshake response
diff --git a/net/websockets/websocket_job.h b/net/websockets/websocket_job.h
index f19653d..d9a6e71 100644
--- a/net/websockets/websocket_job.h
+++ b/net/websockets/websocket_job.h
@@ -39,10 +39,11 @@ class WebSocketJob : public SocketStreamJob, public SocketStream::Delegate {
     CLOSING = 2,
     CLOSED = 3,
   };
-  static void EnsureInit();
 
   explicit WebSocketJob(SocketStream::Delegate* delegate);
 
+  static void EnsureInit();
+
   State state() const { return state_; }
   virtual void Connect();
   virtual bool SendData(const char* data, int len);