Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / pdf / pdf_browsertest.cc

diff --git a/src/chrome/browser/ui/pdf/pdf_browsertest.cc b/src/chrome/browser/ui/pdf/pdf_browsertest.cc
index c424323..aeb9683 100644 (file)
--- a/src/chrome/browser/ui/pdf/pdf_browsertest.cc
+++ b/src/chrome/browser/ui/pdf/pdf_browsertest.cc
@@ -215,15 +215,11 @@ class PDFBrowserTest : public InProcessBrowserTest,
   net::test_server::EmbeddedTestServer pdf_test_server_;
 };
 
-#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS)
+
 // TODO(thestig): http://crbug.com/79837
-#define MAYBE_Basic DISABLED_Basic
-#else
-#define MAYBE_Basic Basic
-#endif
 // Tests basic PDF rendering.  This can be broken depending on bad merges with
 // the vendor, so it's important that we have basic sanity checking.
-IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_Basic) {
+IN_PROC_BROWSER_TEST_F(PDFBrowserTest, DISABLED_Basic) {
   ASSERT_NO_FATAL_FAILURE(Load());
   ASSERT_NO_FATAL_FAILURE(WaitForResponse());
   // OS X uses CoreText, and FreeType renders slightly different on Linux and
@@ -239,8 +235,9 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_Basic) {
 #endif
 }
 
-#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS)
-// TODO(sanjeevr): http://crbug.com/79837
+#if (!defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS)) || \
+    (defined(OS_LINUX) || defined(OS_MACOSX))
+// TODO(sanjeevr): http://crbug.com/79837, http://crbug.com/332778
 #define MAYBE_Scroll DISABLED_Scroll
 #else
 #define MAYBE_Scroll Scroll
@@ -269,8 +266,9 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_Scroll) {
   ASSERT_GT(y_offset, 0);
 }
 
-#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS)
-// TODO(thestig): http://crbug.com/79837
+#if (!defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS)) || \
+    (defined(OS_LINUX) || defined(OS_MACOSX))
+// TODO(thestig): http://crbug.com/79837, http://crbug.com/329912
 #define MAYBE_FindAndCopy DISABLED_FindAndCopy
 #else
 #define MAYBE_FindAndCopy FindAndCopy