Added MediaRouterUIBrowserTest::toolbar_action_view_ to a Widget.

chrome/browser/ui/views/toolbar/toolbar_action_view.cc

 // Copyright 2013 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/toolbar/toolbar_action_view.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 101 matching lines @@
          (base::TimeTicks::Now() - popup_closed_time_).InMilliseconds() >
              views::kMinimumMsBetweenButtonClicks;
 }
 
 SkColor ToolbarActionView::GetInkDropBaseColor() const {
   if (delegate_->ShownInsideMenu()) {
     return GetNativeTheme()->GetSystemColor(
         ui::NativeTheme::kColorId_HoverMenuItemBackgroundColor);
   }
 
-  return GetThemeProvider()
-             ? GetThemeProvider()->GetColor(
-                   ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON)
-             : CustomButton::GetInkDropBaseColor();
+  return GetThemeProvider()->GetColor(
+      ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
 }
 
 bool ToolbarActionView::ShouldShowInkDropHover() const {
   return !delegate_->ShownInsideMenu() &&
          views::MenuButton::ShouldShowInkDropHover();
 }
 
 content::WebContents* ToolbarActionView::GetCurrentWebContents() const {
   return delegate_->GetCurrentWebContents();
 }
@@ skipping 195 matching lines @@
     if (menu_controller->in_nested_run()) {
       // There is another menu showing. Close the outermost menu (since we are
       // shown in the same menu, we don't want to close the whole thing).
       menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST);
       return true;
     }
   }
 
   return false;
 }