Fix the file chooser host unittest.

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=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=151318

[raymes, 2012-08-13 14:42:29]

lgtm

On Sat, Aug 11, 2012 at 11:12 AM,  <brettw@chromium.org> wrote:
> Reviewers: raymes,
>
> Description:
> 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=
>
>
> Please review this at https://chromiumcodereview.appspot.com/10836204/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>   M content/renderer/pepper/mock_renderer_ppapi_host.h
>   M content/renderer/pepper/mock_renderer_ppapi_host.cc
>   M content/renderer/pepper/pepper_file_chooser_host_unittest.cc
>
>
> Index: content/renderer/pepper/mock_renderer_ppapi_host.cc
> diff --git a/content/renderer/pepper/mock_renderer_ppapi_host.cc
> b/content/renderer/pepper/mock_renderer_ppapi_host.cc
> index
>
d72880fb3f9945cb10b5649332d6e10e0f39caf3..042d3a3246e94d7d53284a0c379f312d4e35a384
> 100644
> --- a/content/renderer/pepper/mock_renderer_ppapi_host.cc
> +++ b/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() {
> Index: content/renderer/pepper/mock_renderer_ppapi_host.h
> diff --git a/content/renderer/pepper/mock_renderer_ppapi_host.h
> b/content/renderer/pepper/mock_renderer_ppapi_host.h
> index
>
ddf2437a0d4a43f804161a0dab1d6b30c4d6b43d..471c2b1c9a88de7e6c851da8cc0a80d24d4bc0ff
> 100644
> --- a/content/renderer/pepper/mock_renderer_ppapi_host.h
> +++ b/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.
> 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
>
d8440c09b578cd61144f95d0161200f685c44c00..2cf7ec0b9d210190774e455db44a84c4fd217d22
> 100644
> --- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
> +++ b/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;
>
>

[commit-bot: I haz the power, 2012-08-13 17:31:29]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/brettw@chromium.org/10836204/2001

[commit-bot: I haz the power, 2012-08-13 18:43:01]

Change committed as 151318