Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / bookmarks / bookmark_bar_view_test.cc

diff --git a/src/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/src/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index abb0eae..1f693b0 100644 (file)
--- a/src/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/src/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -9,9 +9,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/bookmarks/bookmark_test_helpers.h"
+#include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
@@ -20,6 +19,7 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
+#include "chrome/common/chrome_content_client.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
@@ -28,11 +28,12 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/base/view_event_test_base.h"
+#include "components/bookmarks/core/browser/bookmark_model.h"
+#include "components/bookmarks/core/test/bookmark_test_helpers.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/test/test_browser_thread.h"
 #include "grit/generated_resources.h"
-#include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/test/ui_controls.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ -43,6 +44,7 @@
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/widget/widget.h"
 
+using base::ASCIIToUTF16;
 using content::BrowserThread;
 using content::OpenURLParams;
 using content::PageNavigator;
@@ -69,10 +71,8 @@ class TestingPageNavigator : public PageNavigator {
   GURL url_;
 };
 
-// TODO(jschuh): Fix bookmark DND tests on Win64. crbug.com/244605
 // TODO(erg): Fix bookmark DBD tests on linux_aura. crbug.com/163931
-#if (defined(OS_WIN) && defined(ARCH_CPU_X86_64)) || \
-  (defined(OS_LINUX) && defined(USE_AURA))
+#if defined(OS_LINUX) && defined(USE_AURA)
 #define MAYBE(x) DISABLED_##x
 #else
 #define MAYBE(x) x
@@ -118,6 +118,11 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase {
         model_(NULL) {}
 
   virtual void SetUp() OVERRIDE {
+    content_client_.reset(new ChromeContentClient);
+    content::SetContentClient(content_client_.get());
+    browser_content_client_.reset(new chrome::ChromeContentBrowserClient());
+    content::SetBrowserClientForTesting(browser_content_client_.get());
+
     views::MenuController::TurnOffMenuSelectionHoldForTest();
     BookmarkBarView::DisableAnimationsForTesting(true);
 
@@ -185,6 +190,10 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase {
 
     ViewEventTestBase::TearDown();
     BookmarkBarView::DisableAnimationsForTesting(false);
+
+    browser_content_client_.reset();
+    content_client_.reset();
+    content::SetContentClient(NULL);
   }
 
  protected:
@@ -239,6 +248,8 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase {
   }
 
   gfx::Size bb_view_pref_;
+  scoped_ptr<ChromeContentClient> content_client_;
+  scoped_ptr<chrome::ChromeContentBrowserClient> browser_content_client_;
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<Browser> browser_;
   scoped_ptr<ScopedTestingLocalState> local_state_;
@@ -431,9 +442,10 @@ VIEW_TEST(BookmarkBarViewTest3, Submenus)
 // Observer that posts task upon the context menu creation.
 // This is necessary for Linux as the context menu has to check
 // the clipboard, which invokes the event loop.
-class ContextMenuNotificationObserver : public content::NotificationObserver {
+class BookmarkContextMenuNotificationObserver
+    : public content::NotificationObserver {
  public:
-  explicit ContextMenuNotificationObserver(const base::Closure& task)
+  explicit BookmarkContextMenuNotificationObserver(const base::Closure& task)
       : task_(task) {
     registrar_.Add(this,
                    chrome::NOTIFICATION_BOOKMARK_CONTEXT_MENU_SHOWN,
@@ -453,7 +465,7 @@ class ContextMenuNotificationObserver : public content::NotificationObserver {
   content::NotificationRegistrar registrar_;
   base::Closure task_;
 
-  DISALLOW_COPY_AND_ASSIGN(ContextMenuNotificationObserver);
+  DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenuNotificationObserver);
 };
 
 // Tests context menus by way of opening a context menu for a bookmark,
@@ -489,7 +501,7 @@ class BookmarkBarViewTest4 : public BookmarkBarViewEventTestBase {
     // Right click on the first child to get its context menu.
     ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
-    // Step3 will be invoked by ContextMenuNotificationObserver.
+    // Step3 will be invoked by BookmarkContextMenuNotificationObserver.
   }
 
   void Step3() {
@@ -511,7 +523,7 @@ class BookmarkBarViewTest4 : public BookmarkBarViewEventTestBase {
     Done();
   }
 
-  ContextMenuNotificationObserver observer_;
+  BookmarkContextMenuNotificationObserver observer_;
 };
 
 VIEW_TEST(BookmarkBarViewTest4, ContextMenus)
@@ -716,7 +728,7 @@ class BookmarkBarViewTest7 : public BookmarkBarViewEventTestBase {
   GURL url_dragging_;
 };
 
-#if !(defined(OS_WIN) && defined(USE_AURA))
+#if !defined(OS_WIN)
 // This test passes locally (on aero and non-aero) but fails on the trybots and
 // buildbot.
 // http://crbug.com/154081
@@ -825,7 +837,7 @@ class BookmarkBarViewTest8 : public BookmarkBarViewEventTestBase {
   GURL url_dragging_;
 };
 
-#if !(defined(OS_WIN) && defined(USE_AURA))
+#if !defined(OS_WIN)
 // This test passes locally (on aero and non-aero) but fails on the trybots and
 // buildbot.
 // http://crbug.com/154081
@@ -1043,7 +1055,7 @@ class BookmarkBarViewTest11 : public BookmarkBarViewEventTestBase {
     // Right click on the first child to get its context menu.
     ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
-    // Step3 will be invoked by ContextMenuNotificationObserver.
+    // Step3 will be invoked by BookmarkContextMenuNotificationObserver.
   }
 
   void Step3() {
@@ -1080,7 +1092,7 @@ class BookmarkBarViewTest11 : public BookmarkBarViewEventTestBase {
     Done();
   }
 
-  ContextMenuNotificationObserver observer_;
+  BookmarkContextMenuNotificationObserver observer_;
 };
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
@@ -1217,7 +1229,7 @@ class BookmarkBarViewTest13 : public BookmarkBarViewEventTestBase {
     // Right click on the first child to get its context menu.
     ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
-    // Step3 will be invoked by ContextMenuNotificationObserver.
+    // Step3 will be invoked by BookmarkContextMenuNotificationObserver.
   }
 
   void Step3() {
@@ -1264,7 +1276,7 @@ class BookmarkBarViewTest13 : public BookmarkBarViewEventTestBase {
     Done();
   }
 
-  ContextMenuNotificationObserver observer_;
+  BookmarkContextMenuNotificationObserver observer_;
 };
 
 VIEW_TEST(BookmarkBarViewTest13, ClickOnContextMenuSeparator)
@@ -1284,7 +1296,7 @@ class BookmarkBarViewTest14 : public BookmarkBarViewEventTestBase {
     views::TextButton* button = GetBookmarkButton(0);
     ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
-    // Step2 will be invoked by ContextMenuNotificationObserver.
+    // Step2 will be invoked by BookmarkContextMenuNotificationObserver.
   }
 
  private:
@@ -1304,7 +1316,7 @@ class BookmarkBarViewTest14 : public BookmarkBarViewEventTestBase {
     Done();
   }
 
-  ContextMenuNotificationObserver observer_;
+  BookmarkContextMenuNotificationObserver observer_;
 };
 
 VIEW_TEST(BookmarkBarViewTest14, ContextMenus2)
@@ -1342,7 +1354,7 @@ class BookmarkBarViewTest15 : public BookmarkBarViewEventTestBase {
     // Right click on the second child to get its context menu.
     ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
-    // Step3 will be invoked by ContextMenuNotificationObserver.
+    // Step3 will be invoked by BookmarkContextMenuNotificationObserver.
   }
 
   void Step3() {
@@ -1381,7 +1393,7 @@ class BookmarkBarViewTest15 : public BookmarkBarViewEventTestBase {
   }
 
   int deleted_menu_id_;
-  ContextMenuNotificationObserver observer_;
+  BookmarkContextMenuNotificationObserver observer_;
 };
 
 VIEW_TEST(BookmarkBarViewTest15, MenuStaysVisibleAfterDelete)
@@ -1457,7 +1469,7 @@ class BookmarkBarViewTest17 : public BookmarkBarViewEventTestBase {
     ASSERT_TRUE(child_menu != NULL);
     ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
-    // Step3 will be invoked by ContextMenuNotificationObserver.
+    // Step3 will be invoked by BookmarkContextMenuNotificationObserver.
   }
 
   void Step3() {
@@ -1485,7 +1497,7 @@ class BookmarkBarViewTest17 : public BookmarkBarViewEventTestBase {
     observer_.set_task(CreateEventTask(this, &BookmarkBarViewTest17::Step4));
     MoveMouseAndPress(clickable_rect.CenterPoint(), ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
-    // Step4 will be invoked by ContextMenuNotificationObserver.
+    // Step4 will be invoked by BookmarkContextMenuNotificationObserver.
   }
 
   void Step4() {
@@ -1503,7 +1515,7 @@ class BookmarkBarViewTest17 : public BookmarkBarViewEventTestBase {
     Done();
   }
 
-  ContextMenuNotificationObserver observer_;
+  BookmarkContextMenuNotificationObserver observer_;
 };
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
@@ -1745,9 +1757,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEventTestBase {
   TestViewForMenuExit* test_view_;
 };
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-#define MAYBE_ContextMenuExitTest DISABLED_ContextMenuExitTest
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 // TODO(erg): linux_aura bringup: http://crbug.com/163931
 #define MAYBE_ContextMenuExitTest DISABLED_ContextMenuExitTest
 #else
@@ -1792,7 +1802,7 @@ class BookmarkBarViewTest21 : public BookmarkBarViewEventTestBase {
     // Right click on the first child to get its context menu.
     ui_test_utils::MoveMouseToCenterAndPress(view, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
-    // Step3 will be invoked by ContextMenuNotificationObserver.
+    // Step3 will be invoked by BookmarkContextMenuNotificationObserver.
   }
 
   // Confirm that context menu shows and click REMOVE menu.
@@ -1824,7 +1834,7 @@ class BookmarkBarViewTest21 : public BookmarkBarViewEventTestBase {
     Done();
   }
 
-  ContextMenuNotificationObserver observer_;
+  BookmarkContextMenuNotificationObserver observer_;
 };
 
 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder)