Fix bookmark bubble/star view highlighting for Harmony.

chrome/browser/ui/views/keyboard_access_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.
 
 // This functionality currently works on Windows and on Linux when
 // toolkit_views is defined (i.e. for Chrome OS). It's not needed
 // on the Mac, and it's not yet implemented on Linux.
 
 #include "base/location.h"
 #include "base/macros.h"
@@ skipping 187 matching lines @@
   // Get the focused view ID, then press a key to activate the
   // page menu, then wait until the focused view changes.
   int original_view_id = GetFocusedViewID();
 
   content::WindowedNotificationObserver new_tab_observer(
       chrome::NOTIFICATION_TAB_ADDED,
       content::Source<content::WebContentsDelegate>(browser()));
 
   BrowserView* browser_view = reinterpret_cast<BrowserView*>(
       browser()->window());
-  SendKeysMenuListener menu_listener(
-    browser_view->GetToolbarView()->app_menu_button(), browser(), false);
+  SendKeysMenuListener menu_listener(browser_view->toolbar()->app_menu_button(),
+                                     browser(), false);
 
   if (focus_omnibox)
     browser()->window()->GetLocationBar()->FocusLocation(false);
 
 #if defined(OS_CHROMEOS)
   // Chrome OS doesn't have a way to just focus the app menu, so we use Alt+F to
   // bring up the menu.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), ui::VKEY_F, false, shift, true, false));
 #else
@@ skipping 90 matching lines @@
   ui_test_utils::NavigateToURL(browser(), GURL("about:"));
 
   ASSERT_EQ(0, browser()->tab_strip_model()->active_index());
 
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
 
   int original_view_id = GetFocusedViewID();
 
   BrowserView* browser_view = reinterpret_cast<BrowserView*>(
       browser()->window());
-  SendKeysMenuListener menu_listener(
-    browser_view->GetToolbarView()->app_menu_button(), browser(), true);
+  SendKeysMenuListener menu_listener(browser_view->toolbar()->app_menu_button(),
+                                     browser(), true);
 
   browser()->window()->GetLocationBar()->FocusLocation(false);
 
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), ui::VKEY_F10, false, false, false, false));
 
   WaitForFocusedViewIDToChange(original_view_id);
 
   SendKeyPress(browser(), ui::VKEY_DOWN);
   content::RunMessageLoop();
@@ skipping 107 matching lines @@
       browser(), ui::VKEY_BROWSER_FORWARD, false, false, false, false));
 
   base::string16 after_forward;
   ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(), &after_forward));
 
   EXPECT_EQ(before_back, after_forward);
 }
 #endif
 
 }  // namespace