Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / find_bar / find_bar_host_browsertest.cc

diff --git a/src/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/src/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
index 83e24e8..55a2477 100644 (file)
--- a/src/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/src/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -25,7 +25,6 @@
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/find_in_page_observer.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ -289,8 +288,8 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageFormsTextAreas) {
 
 // Verify search for text within special URLs such as chrome:history,
 // chrome://downloads, data directory
-#if defined(OS_WIN)
-// Disabled due to crbug.com/175711
+#if defined(OS_WIN) || defined(OS_MACOSX)
+// Disabled due to crbug.com/175711 and http://crbug.com/419987
 #define MAYBE_SearchWithinSpecialURL \
         DISABLED_SearchWithinSpecialURL
 #else
@@ -332,10 +331,16 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_SearchWithinSpecialURL) {
                             kFwd, kIgnoreCase, NULL));
 }
 
+#if defined(OS_MACOSX)
+// Disabled due to http://crbug.com/419769.
+#define MAYBE_FindInPageSpecialURLs DISABLED_FindInPageSpecialURLs
+#else
+#define MAYBE_FindInPageSpecialURLs FindInPageSpecialURLs
+#endif
 // Verify search selection coordinates. The data file used is set-up such that
 // the text occurs on the same line, and we verify their positions by verifying
 // their relative positions.
-IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageSpecialURLs) {
+IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_FindInPageSpecialURLs) {
   std::wstring search_string(L"\u5728\u897f\u660c\u536b\u661f\u53d1");
   gfx::Rect first, second, first_reverse;
   WebContents* web_contents =
@@ -361,9 +366,16 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageSpecialURLs) {
   ASSERT_EQ(first, first_reverse);
 }
 
+#if defined(OS_MACOSX)
+// Disabled due to http://crbug.com/419769.
+#define MAYBE_CommentsAndMetaDataNotSearchable \
+  DISABLED_CommentsAndMetaDataNotSearchable
+#else
+#define MAYBE_CommentsAndMetaDataNotSearchable CommentsAndMetaDataNotSearchable
+#endif
 // Verifies that comments and meta data are not searchable.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
-                       CommentsAndMetaDataNotSearchable) {
+                       MAYBE_CommentsAndMetaDataNotSearchable) {
   WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ui_test_utils::NavigateToURL(browser(), GetURL("specialchar.html"));