Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6105)

Unified Diff: chrome/browser/chromeos/gview_request_interceptor_unittest.cc

Issue 8589010: Disable GViewRequestInterceptorTest.InterceptPdfWithNoPlugin on official builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: thestig's comment Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/gview_request_interceptor_unittest.cc
diff --git a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
index 5fba6c160a91ea137b137de40cd813f1c2d2f27b..29726a6465fbc16e1cd7b45ccb96cb81ffdecae2 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_);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698