diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 19:41:38 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 19:41:38 +0000 |
| commit | 84f1cf0f93c5f075c88106dfa74c4edec4d29304 (patch) | |
| tree | 257c107059535aadb73373ee0b8134786d081361 /content | |
| parent | 2c93c7b45f5be45500f8be08c54a20f93dcc7788 (diff) | |
| download | chromium_src-84f1cf0f93c5f075c88106dfa74c4edec4d29304.zip chromium_src-84f1cf0f93c5f075c88106dfa74c4edec4d29304.tar.gz chromium_src-84f1cf0f93c5f075c88106dfa74c4edec4d29304.tar.bz2 | |
Move the pepper file chooser host to unit tests.
This also renames the file accordingly.
Review URL: https://chromiumcodereview.appspot.com/10790065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/content_tests.gypi | 5 | ||||
| -rw-r--r-- | content/renderer/pepper/pepper_file_chooser_host_unittest.cc (renamed from content/renderer/pepper/pepper_file_chooser_host_browsertest.cc) | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 33be60f..46d0043 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -529,12 +529,7 @@ 'content_shell_pak', 'test_support_content', '../base/base.gyp:test_support_base', - '../ipc/ipc.gyp:test_support_ipc', '../net/net.gyp:net_test_support', - '../ppapi/ppapi_internal.gyp:ppapi_host', - '../ppapi/ppapi_internal.gyp:ppapi_proxy', - '../ppapi/ppapi_internal.gyp:ppapi_shared', - '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../ui/ui.gyp:ui', diff --git a/content/renderer/pepper/pepper_file_chooser_host_browsertest.cc b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc index 6a482d3..61d02c3 100644 --- a/content/renderer/pepper/pepper_file_chooser_host_browsertest.cc +++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc @@ -30,9 +30,12 @@ namespace { class PepperFileChooserHostTest : public RenderViewTest { public: - PepperFileChooserHostTest() : pp_instance_(123456) {} + PepperFileChooserHostTest() + : pp_instance_(123456), + old_content_client_(NULL) {} virtual void SetUp() { + old_content_client_ = GetContentClient(); SetContentClient(&client_); RenderViewTest::SetUp(); @@ -42,7 +45,7 @@ class PepperFileChooserHostTest : public RenderViewTest { globals_.GetResourceTracker()->DidDeleteInstance(pp_instance_); RenderViewTest::TearDown(); - SetContentClient(NULL); + SetContentClient(old_content_client_); } PP_Instance pp_instance() const { return pp_instance_; } @@ -52,6 +55,9 @@ class PepperFileChooserHostTest : public RenderViewTest { ppapi::TestGlobals globals_; TestContentClient client_; + + // Original value for the content client. + ContentClient* old_content_client_; }; // For testing to convert our hardcoded file paths to 8-bit. |