X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fui%2Fviews%2Fbookmarks%2Fbookmark_bar_view_test.cc;h=1f693b0116d7171d400767fc33d85c2a2511b2fb;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=2def6b7ae99b0f508b2176c85dcae3e756637d2d;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git 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 2def6b7..1f693b0 100644 --- 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,7 @@ #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" @@ -30,6 +28,8 @@ #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" @@ -71,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