Bind RenderViewImpl routing_id to SocketStreamHost

webkit/glue/websocketstreamhandle_impl.h

Index: webkit/glue/websocketstreamhandle_impl.h
diff --git a/webkit/glue/websocketstreamhandle_impl.h b/webkit/glue/websocketstreamhandle_impl.h
index 575cc6cbbf316bc9cef0b7b92fd1dff2050e95e5..77969adee50f4e6ffe4c685ae2074eef002664a6 100644
--- a/webkit/glue/websocketstreamhandle_impl.h
+++ b/webkit/glue/websocketstreamhandle_impl.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.
 
@@ -6,6 +6,7 @@
 #define WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_IMPL_H_
 
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSocketStreamHandle.h"
 
 namespace webkit_glue {
@@ -14,20 +15,29 @@ class WebKitPlatformSupportImpl;
 
 class WebSocketStreamHandleImpl : public WebKit::WebSocketStreamHandle {
  public:
+  class ExtraData {
+  public:
+    virtual ~ExtraData() {}
+  };
   explicit WebSocketStreamHandleImpl(WebKitPlatformSupportImpl* platform);
   virtual ~WebSocketStreamHandleImpl();
 
   // WebSocketStreamHandle methods:
   virtual void connect(
       const WebKit::WebURL& url,
-      WebKit::WebSocketStreamHandleClient* client);
-  virtual bool send(const WebKit::WebData& data);
-  virtual void close();
+      WebKit::WebSocketStreamHandleClient* client) OVERRIDE;
+  virtual bool send(const WebKit::WebData& data) OVERRIDE;
+  virtual void close() OVERRIDE;

[tony, 2012/03/19 20:52:56]

I would not mark these as OVERRIDE.  It makes refactoring harder since the
interface lives in the upstream repository.

[Takashi Toyoshima, 2012/03/19 22:58:44]

Done.

+
+  // Handle extra data associated with the object.
+  const ExtraData* extraData() const { return extra_data_.get(); }
+  void setExtraData(ExtraData* extra_data) { extra_data_.reset(extra_data); }
 
  private:
   class Context;
   scoped_refptr<Context> context_;
   WebKitPlatformSupportImpl* platform_;
+  scoped_ptr<ExtraData> extra_data_;
 
   DISALLOW_COPY_AND_ASSIGN(WebSocketStreamHandleImpl);
 };