Fix the file chooser host unittest.

The has_user_gesture flag was uninitialized which made the test random. I initialized it and set it the way the tests expect.

BUG=


Review URL: https://chromiumcodereview.appspot.com/10836204

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151318 0039d316-1c4b-4281-b951-d872f2087c98

content/renderer/pepper/mock_renderer_ppapi_host.cc

@@ -12,7 +12,8 @@ MockRendererPpapiHost::MockRendererPpapiHost(RenderView* render_view,
     : sink_(),
       ppapi_host_(&sink_, NULL, ppapi::PpapiPermissions()),
       render_view_(render_view),
-      pp_instance_(instance) {
+      pp_instance_(instance),
+      has_user_gesture_(false) {
 }
 
 MockRendererPpapiHost::~MockRendererPpapiHost() {

content/renderer/pepper/mock_renderer_ppapi_host.h

@@ -33,6 +33,7 @@ class MockRendererPpapiHost : public RendererPpapiHost {
   ppapi::proxy::ResourceMessageTestSink& sink() { return sink_; }
   PP_Instance pp_instance() const { return pp_instance_; }
 
+  // Sets whether there is currently a user gesture. Defaults to false.
   void set_has_user_gesture(bool gesture) { has_user_gesture_ = gesture; }
 
   // RendererPpapiHost.

content/renderer/pepper/pepper_file_chooser_host_unittest.cc

@@ -9,7 +9,6 @@
 #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/render_view_impl.h"
 #include "content/test/test_content_client.h"
 #include "ppapi/c/pp_errors.h"
@@ -72,13 +71,15 @@ std::string FilePathToUTF8(const FilePath::StringType& path) {
 
 }  // namespace
 
-/* TODO(brettw) fix & re-enable this test.
 TEST_F(PepperFileChooserHostTest, Show) {
   PP_Resource pp_resource = 123;
 
   MockRendererPpapiHost host(view_, pp_instance());
   PepperFileChooserHost chooser(&host, pp_instance(), pp_resource);
 
+  // Say there's a user gesture.
+  host.set_has_user_gesture(true);
+
   std::vector<std::string> accept;
   accept.push_back("text/plain");
   PpapiHostMsg_FileChooser_Show show_msg(false, false, std::string(), accept);
@@ -134,7 +135,6 @@ TEST_F(PepperFileChooserHostTest, Show) {
   EXPECT_EQ(FilePathToUTF8(selected_info.display_name),
             chooser_results[0].name);
 }
-*/
 
 TEST_F(PepperFileChooserHostTest, NoUserGesture) {
   PP_Resource pp_resource = 123;