diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 22:45:41 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 22:45:41 +0000 |
| commit | c829088cfd334560de65d2bef1441c1b4dc68b25 (patch) | |
| tree | bf35cb89444453d0007e51a1c2f75e3a850836e0 /chrome/browser/ui/pdf/pdf_browsertest.cc | |
| parent | 0ff6198e70ef84b03b43673650e8f9f0444d78b2 (diff) | |
| download | chromium_src-c829088cfd334560de65d2bef1441c1b4dc68b25.zip chromium_src-c829088cfd334560de65d2bef1441c1b4dc68b25.tar.gz chromium_src-c829088cfd334560de65d2bef1441c1b4dc68b25.tar.bz2 | |
Compile pdf_browsertest.cc in non-official builds too.
This prevents build breakages on internal buildbots.
The actual tests in the file are still disabled, because they depend on the PDF viewer.
BUG=none
Review URL: https://codereview.chromium.org/120303004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/pdf/pdf_browsertest.cc')
| -rw-r--r-- | chrome/browser/ui/pdf/pdf_browsertest.cc | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/chrome/browser/ui/pdf/pdf_browsertest.cc b/chrome/browser/ui/pdf/pdf_browsertest.cc index 72d5d5a..c424323 100644 --- a/chrome/browser/ui/pdf/pdf_browsertest.cc +++ b/chrome/browser/ui/pdf/pdf_browsertest.cc @@ -31,6 +31,9 @@ using content::NavigationController; using content::WebContents; +// Note: All tests in here require the internal PDF plugin, so they're disabled +// in non-official builds. We still compile them though, to prevent bitrot. + namespace { // Include things like browser frame and scrollbar and make sure we're bigger @@ -212,8 +215,8 @@ class PDFBrowserTest : public InProcessBrowserTest, net::test_server::EmbeddedTestServer pdf_test_server_; }; -#if defined(OS_CHROMEOS) -// TODO(sanjeevr): http://crbug.com/79837 +#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS) +// TODO(thestig): http://crbug.com/79837 #define MAYBE_Basic DISABLED_Basic #else #define MAYBE_Basic Basic @@ -236,7 +239,7 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_Basic) { #endif } -#if defined(OS_CHROMEOS) +#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS) // TODO(sanjeevr): http://crbug.com/79837 #define MAYBE_Scroll DISABLED_Scroll #else @@ -266,8 +269,8 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_Scroll) { ASSERT_GT(y_offset, 0); } -#if defined(OS_CHROMEOS) -// TODO(sanjeevr): http://crbug.com/79837 +#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS) +// TODO(thestig): http://crbug.com/79837 #define MAYBE_FindAndCopy DISABLED_FindAndCopy #else #define MAYBE_FindAndCopy FindAndCopy @@ -304,7 +307,12 @@ const int kLoadingNumberOfParts = 10; // This also loads all documents that used to crash, to ensure we don't have // regressions. // If it flakes, reopen http://crbug.com/74548. -IN_PROC_BROWSER_TEST_P(PDFBrowserTest, Loading) { +#if !defined(GOOGLE_CHROME_BUILD) +#define MAYBE_Loading DISABLED_Loading +#else +#define MAYBE_Loading Loading +#endif +IN_PROC_BROWSER_TEST_P(PDFBrowserTest, MAYBE_Loading) { ASSERT_TRUE(pdf_test_server()->InitializeAndWaitUntilReady()); NavigationController* controller = @@ -370,7 +378,7 @@ INSTANTIATE_TEST_CASE_P(PDFTestFiles, PDFBrowserTest, testing::Range(0, kLoadingNumberOfParts)); -#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX) +#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_MACOSX) // http://crbug.com/315160 #define MAYBE_Action DISABLED_Action #else |