Refactoring of new IPC-only pepper implementation

content/renderer/pepper/pepper_file_chooser_host_unittest.cc

Index: content/renderer/pepper/pepper_file_chooser_host_unittest.cc
diff --git a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
index 09836bc19829c9b8faa273152901f05d1bcd1219..2e17a807703a788faeee0bca56cbf5af49d05276 100644
--- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
+++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
@@ -7,8 +7,9 @@
 #include "content/common/view_messages.h"
 #include "content/public/test/render_view_test.h"
 #include "content/public/common/file_chooser_params.h"
+#include "content/renderer/pepper/mock_renderer_ppapi_host.h"
 #include "content/renderer/pepper/pepper_file_chooser_host.h"
-#include "content/renderer/pepper/pepper_instance_state_accessor.h"
+//#include "content/renderer/pepper/pepper_instance_state_accessor.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/test/test_content_client.h"
 #include "ppapi/c/pp_errors.h"
@@ -69,36 +70,13 @@ std::string FilePathToUTF8(const FilePath::StringType& path) {
 #endif
 }
 
-class MockInstanceState : public PepperInstanceStateAccessor {
- public:
-  MockInstanceState() : has_user_gesture_(true) {}
-  virtual ~MockInstanceState() {}
-
-  void set_has_user_gesture(bool has) { has_user_gesture_ = has; }
-
-  // PepperInstanceStateAccessor.
-  virtual bool IsValidInstance(PP_Instance instance) OVERRIDE {
-    return true;
-  }
-  virtual bool HasUserGesture(PP_Instance instance) OVERRIDE {
-    return has_user_gesture_;
-  }
-
- private:
-  bool has_user_gesture_;
-};
-
 }  // namespace
 
 TEST_F(PepperFileChooserHostTest, Show) {
   PP_Resource pp_resource = 123;
 
-  MockInstanceState state;
-  ppapi::proxy::ResourceMessageTestSink sink;
-  ppapi::host::PpapiHost host(&sink, NULL, ppapi::PpapiPermissions());
-  RenderViewImpl* view_impl = static_cast<RenderViewImpl*>(view_);
-  PepperFileChooserHost chooser(&host, pp_instance(), pp_resource, view_impl,
-                                &state);
+  MockRendererPpapiHost host(view_, pp_instance());
+  PepperFileChooserHost chooser(&host, pp_instance(), pp_resource);
 
   std::vector<std::string> accept;
   accept.push_back("text/plain");
@@ -130,6 +108,7 @@ TEST_F(PepperFileChooserHostTest, Show) {
   selected_info.local_path = FilePath(FILE_PATH_LITERAL("myp\\ath/foo"));
   std::vector<ui::SelectedFileInfo> selected_info_vector;
   selected_info_vector.push_back(selected_info);
+  RenderViewImpl* view_impl = static_cast<RenderViewImpl*>(view_);
   ViewMsg_RunFileChooserResponse response(view_impl->routing_id(),
                                           selected_info_vector);
   EXPECT_TRUE(view_impl->OnMessageReceived(response));
@@ -137,7 +116,7 @@ TEST_F(PepperFileChooserHostTest, Show) {
   // This should have sent the Pepper reply to our test sink.
   ppapi::proxy::ResourceMessageReplyParams reply_params;
   IPC::Message reply_msg;
-  ASSERT_TRUE(sink.GetFirstResourceReplyMatching(
+  ASSERT_TRUE(host.sink().GetFirstResourceReplyMatching(
       PpapiPluginMsg_FileChooser_ShowReply::ID, &reply_params, &reply_msg));
 
   // Basic validation of reply.
@@ -158,15 +137,11 @@ TEST_F(PepperFileChooserHostTest, Show) {
 TEST_F(PepperFileChooserHostTest, NoUserGesture) {
   PP_Resource pp_resource = 123;
 
-  MockInstanceState state;
-  ppapi::proxy::ResourceMessageTestSink sink;
-  ppapi::host::PpapiHost host(&sink, NULL, ppapi::PpapiPermissions());
-  RenderViewImpl* view_impl = static_cast<RenderViewImpl*>(view_);
-  PepperFileChooserHost chooser(&host, pp_instance(), pp_resource, view_impl,
-                                &state);
+  MockRendererPpapiHost host(view_, pp_instance());
+  PepperFileChooserHost chooser(&host, pp_instance(), pp_resource);
 
   // Say there's no user gesture.
-  state.set_has_user_gesture(false);
+  host.set_has_user_gesture(false);
 
   std::vector<std::string> accept;
   accept.push_back("text/plain");