Fix bookmark bubble/star view highlighting for Harmony.

chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc

 // Copyright 2014 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 "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ skipping 31 matching lines @@
       extensions::CommandService::Get(browser()->profile());
 
   // Simulate the user setting the keybinding to Ctrl+D.
   command_service->UpdateKeybindingPrefs(
       extension->id(), extensions::manifest_values::kBrowserActionCommandEvent,
       kBookmarkKeybinding);
 
   // Check that the BookmarkBubbleView is shown when clicking on the star.
   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());
@@ skipping 19 matching lines @@
   command_service->UpdateKeybindingPrefs(
       extension->id(), extensions::manifest_values::kBrowserActionCommandEvent,
       kBookmarkKeybinding);
 
   // Check that the BookmarkBubbleView is shown when executing
   // IDC_BOOKMARK_PAGE.
   EXPECT_FALSE(BookmarkBubbleView::bookmark_bubble());
   chrome::ExecuteCommand(browser(), IDC_BOOKMARK_PAGE);
   EXPECT_TRUE(BookmarkBubbleView::bookmark_bubble());
 }