Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / public / test / mock_render_thread.h

diff --git a/src/content/public/test/mock_render_thread.h b/src/content/public/test/mock_render_thread.h
index 95a944e..b664697 100644 (file)
--- a/src/content/public/test/mock_render_thread.h
+++ b/src/content/public/test/mock_render_thread.h
@@ -10,11 +10,13 @@
 #include "base/strings/string16.h"
 #include "content/public/renderer/render_thread.h"
 #include "ipc/ipc_test_sink.h"
+#include "ipc/message_filter.h"
 #include "third_party/WebKit/public/web/WebPopupType.h"
 
 struct ViewHostMsg_CreateWindow_Params;
 
 namespace IPC {
+class MessageFilter;
 class MessageReplyDeserializer;
 }
 
@@ -33,11 +35,6 @@ class MockRenderThread : public RenderThread {
   // Provides access to the messages that have been received by this thread.
   IPC::TestSink& sink() { return sink_; }
 
-  // Helpers for embedders to know when content IPC messages are received, since
-  // they don't have access to content IPC files.
-  void VerifyRunJavaScriptMessageSend(
-      const base::string16& expected_alert_message);
-
   // RenderThread implementation:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
   virtual base::MessageLoop* GetMessageLoop() OVERRIDE;
@@ -49,8 +46,8 @@ class MockRenderThread : public RenderThread {
   virtual void AddRoute(int32 routing_id, IPC::Listener* listener) OVERRIDE;
   virtual void RemoveRoute(int32 routing_id) OVERRIDE;
   virtual int GenerateRoutingID() OVERRIDE;
-  virtual void AddFilter(IPC::ChannelProxy::MessageFilter* filter) OVERRIDE;
-  virtual void RemoveFilter(IPC::ChannelProxy::MessageFilter* filter) OVERRIDE;
+  virtual void AddFilter(IPC::MessageFilter* filter) OVERRIDE;
+  virtual void RemoveFilter(IPC::MessageFilter* filter) OVERRIDE;
   virtual void AddObserver(RenderProcessObserver* observer) OVERRIDE;
   virtual void RemoveObserver(RenderProcessObserver* observer) OVERRIDE;
   virtual void SetResourceDispatcherDelegate(
@@ -161,7 +158,7 @@ class MockRenderThread : public RenderThread {
   scoped_ptr<IPC::MessageReplyDeserializer> reply_deserializer_;
 
   // A list of message filters added to this thread.
-  std::vector<scoped_refptr<IPC::ChannelProxy::MessageFilter> > filters_;
+  std::vector<scoped_refptr<IPC::MessageFilter> > filters_;
 
   // Observers to notify.
   ObserverList<RenderProcessObserver> observers_;