Fix bookmark bubble/star view highlighting for Harmony.

chrome/browser/ui/views/location_bar/star_view_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/location_bar/star_view.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 23 matching lines @@
 // Verify that clicking the bookmark star a second time hides the bookmark
 // bubble.
 #if defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)
 #define MAYBE_HideOnSecondClick DISABLED_HideOnSecondClick
 #else
 #define MAYBE_HideOnSecondClick HideOnSecondClick
 #endif
 IN_PROC_BROWSER_TEST_F(StarViewTest, MAYBE_HideOnSecondClick) {
   BrowserView* browser_view = reinterpret_cast<BrowserView*>(
       browser()->window());
-  views::View* star_view =
-      browser_view->GetToolbarView()->location_bar()->star_view();
+  views::View* star_view = browser_view->toolbar()->location_bar()->star_view();
 
   ui::MouseEvent pressed_event(
       ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(),
       ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
   ui::MouseEvent released_event(
       ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(),
       ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
 
   // Verify that clicking once shows the bookmark bubble.
   EXPECT_FALSE(BookmarkBubbleView::bookmark_bubble());
   star_view->OnMousePressed(pressed_event);
   EXPECT_FALSE(BookmarkBubbleView::bookmark_bubble());
   star_view->OnMouseReleased(released_event);
   EXPECT_TRUE(BookmarkBubbleView::bookmark_bubble());
 
   // Verify that clicking again doesn't reshow it.
   star_view->OnMousePressed(pressed_event);
   // Hide the bubble manually. In the browser this would normally happen during
   // the event processing.
   BookmarkBubbleView::Hide();
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(BookmarkBubbleView::bookmark_bubble());
   star_view->OnMouseReleased(released_event);
   EXPECT_FALSE(BookmarkBubbleView::bookmark_bubble());
 }
 
 }  // namespace