Fix the file chooser host unittest.

content/renderer/pepper/pepper_file_chooser_host_unittest.cc

 // 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.
 
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #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/render_view_impl.h"
 #include "content/test/test_content_client.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/host_message_context.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/resource_message_params.h"
 #include "ppapi/proxy/resource_message_test_sink.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 #include "ppapi/shared_impl/ppb_file_ref_shared.h"
@@ skipping 42 matching lines @@
 std::string FilePathToUTF8(const FilePath::StringType& path) {
 #if defined(OS_WIN)
   return UTF16ToUTF8(path);
 #else
   return path;
 #endif
 }
 
 }  // 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);
 
   ppapi::proxy::ResourceMessageCallParams call_params(pp_resource, 0);
   ppapi::host::HostMessageContext context(call_params);
   int32 result = chooser.OnResourceMessageReceived(show_msg, &context);
   EXPECT_EQ(PP_OK_COMPLETIONPENDING, result);
 
   // The render view should have sent a chooser request to the browser
@@ skipping 35 matching lines @@
   ASSERT_TRUE(PpapiPluginMsg_FileChooser_ShowReply::Read(&reply_msg,
                                                          &reply_msg_param));
   const std::vector<ppapi::PPB_FileRef_CreateInfo>& chooser_results =
       reply_msg_param.a;
   ASSERT_EQ(1u, chooser_results.size());
   // Note path is empty because this is an external filesystem.
   EXPECT_EQ(std::string(), chooser_results[0].path);
   EXPECT_EQ(FilePathToUTF8(selected_info.display_name),
             chooser_results[0].name);
 }
-*/
 
 TEST_F(PepperFileChooserHostTest, NoUserGesture) {
   PP_Resource pp_resource = 123;
 
   MockRendererPpapiHost host(view_, pp_instance());
   PepperFileChooserHost chooser(&host, pp_instance(), pp_resource);
 
   // Say there's no user gesture.
   host.set_has_user_gesture(false);
 
   std::vector<std::string> accept;
   accept.push_back("text/plain");
   PpapiHostMsg_FileChooser_Show show_msg(false, false, std::string(), accept);
 
   ppapi::proxy::ResourceMessageCallParams call_params(pp_resource, 0);
   ppapi::host::HostMessageContext context(call_params);
   int32 result = chooser.OnResourceMessageReceived(show_msg, &context);
   EXPECT_EQ(PP_ERROR_NO_USER_GESTURE, result);
 }
 
 }  // namespace content