bookmarks: Disable BookmarkBar animations on the views side.

It turns out that we don't need to call DisableBookmarkBarViewAnimationsForTesting()
in bookmark_context_menu_controller_unittest.cc, that allow us to move it
from bookmark_utils.h to bookmark_bar_view.h making it views only.

BUG=144783
TEST=unit_tests --gtest_filter=*Bookmark*
TEST=interactive_ui_tests --gtest_filter=*Bookmark*
R=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/12536004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187163 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 12 deletions

diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
index 71d2362..4eb40af 100644
--- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
@@ -11,7 +11,6 @@
 #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_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/test/base/testing_profile.h"
@@ -45,11 +44,7 @@ class BookmarkContextMenuControllerTest : public testing::Test {
         model_(NULL) {
   }
 
-  virtual void SetUp() {
-#if defined(OS_WIN)
-    bookmark_utils::DisableBookmarkBarViewAnimationsForTesting(true);
-#endif
-
+  virtual void SetUp() OVERRIDE {
     profile_.reset(new TestingProfile());
     profile_->CreateBookmarkModel(true);
     profile_->BlockUntilBookmarkModelLoaded();
@@ -59,11 +54,7 @@ class BookmarkContextMenuControllerTest : public testing::Test {
     AddTestData();
   }
 
-  virtual void TearDown() {
-#if defined(OS_WIN)
-    bookmark_utils::DisableBookmarkBarViewAnimationsForTesting(false);
-#endif
-
+  virtual void TearDown() OVERRIDE {
     ui::Clipboard::DestroyClipboardForCurrentThread();
 
     // Flush the message loop to make application verifiers happy.
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc
index 4d104be..6b84ced 100644
--- a/chrome/browser/ui/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc
@@ -8,9 +8,9 @@
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
+#include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"