diff options
| author | tbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 06:14:40 +0000 |
|---|---|---|
| committer | tbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 06:14:40 +0000 |
| commit | 98487029181b37c6ab3932afcac9da075221f96a (patch) | |
| tree | 6bcebc92953a6f7931cec19c5f2eca7a40d28980 | |
| parent | 77310b82bbc709e41fbb084ec38157d384c2a2a2 (diff) | |
| download | chromium_src-98487029181b37c6ab3932afcac9da075221f96a.zip chromium_src-98487029181b37c6ab3932afcac9da075221f96a.tar.gz chromium_src-98487029181b37c6ab3932afcac9da075221f96a.tar.bz2 | |
Disable GViewRequestInterceptorTest.InterceptPdfWithNoPlugin on official builds.
the test doesn't make much sense on officail builds, and it fails on them
BUG=104566
TEST=none
Review URL: http://codereview.chromium.org/8589010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110454 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/gview_request_interceptor_unittest.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc index 5fba6c1..29726a6 100644 --- a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc +++ b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc @@ -244,6 +244,10 @@ TEST_F(GViewRequestInterceptorTest, InterceptPdfWhenDisabled) { EXPECT_EQ(GURL(kPdfUrlIntercepted), request.url()); } +#if !defined(OFFICIAL_BUILD) +// Official builds have pdf plugin by default, and we cannot unload it, so the +// test fails. Since pdf plugin is always present, we don't need to run this +// test. TEST_F(GViewRequestInterceptorTest, InterceptPdfWithNoPlugin) { SetPDFPluginLoadedState(false); @@ -254,6 +258,7 @@ TEST_F(GViewRequestInterceptorTest, InterceptPdfWithNoPlugin) { EXPECT_EQ(1, test_delegate_.received_redirect_count()); EXPECT_EQ(GURL(kPdfUrlIntercepted), request.url()); } +#endif TEST_F(GViewRequestInterceptorTest, InterceptPowerpoint) { net::URLRequest request(GURL(kPptUrl), &test_delegate_); |