diff options
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_context_menu_test.cc | 11 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_test.cc b/chrome/browser/bookmarks/bookmark_context_menu_test.cc index e5a07ad..d11d14a 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_test.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu_test.cc @@ -6,7 +6,6 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/profile.h" -#include "chrome/browser/views/bookmark_bar_view.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/browser/tab_contents/page_navigator.h" @@ -14,6 +13,10 @@ #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" +#if defined(OS_WIN) +#include "chrome/browser/views/bookmark_bar_view.h" +#endif + namespace { // PageNavigator implementation that records the URL. @@ -38,7 +41,9 @@ class BookmarkContextMenuTest : public testing::Test { } virtual void SetUp() { +#if defined(OS_WIN) BookmarkBarView::testing_ = true; +#endif profile_.reset(new TestingProfile()); profile_->set_has_history_service(true); @@ -51,7 +56,9 @@ class BookmarkContextMenuTest : public testing::Test { } virtual void TearDown() { +#if defined(OS_WIN) BookmarkBarView::testing_ = false; +#endif // Flush the message loop to make Purify happy. message_loop_.RunAllPending(); @@ -114,7 +121,7 @@ TEST_F(BookmarkContextMenuTest, OpenAll) { NULL, profile_.get(), &navigator_, folder, NEW_FOREGROUND_TAB); // Should have navigated to F1's children. - ASSERT_EQ(2, navigator_.urls_.size()); + ASSERT_EQ(static_cast<size_t>(2), navigator_.urls_.size()); ASSERT_TRUE(folder->GetChild(0)->GetURL() == navigator_.urls_[0]); ASSERT_TRUE(folder->GetChild(1)->GetChild(0)->GetURL() == navigator_.urls_[1]); diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 7822de3..2005383 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -2321,6 +2321,7 @@ '../third_party/GTM', ], 'sources!': [ + 'browser/bookmarks/bookmark_context_menu_test.cc', 'browser/back_forward_menu_model_unittest.cc', 'browser/download/download_manager_unittest.cc', 'browser/gtk/go_button_gtk_unittest.cc', @@ -2356,7 +2357,6 @@ ], }, { # else: OS != "win" 'sources!': [ - 'browser/bookmarks/bookmark_context_menu_test.cc', 'browser/bookmarks/bookmark_drag_data_unittest.cc', 'browser/bookmarks/bookmark_folder_tree_model_unittest.cc', 'browser/bookmarks/bookmark_table_model_unittest.cc', |