[ToolbarActionViewController] Update return type of GetId().

chrome/browser/ui/toolbar/media_router_action.cc

 // Copyright 2015 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/toolbar/media_router_action.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/router/issue.h"
 #include "chrome/browser/media/router/media_route.h"
 #include "chrome/browser/media/router/media_router.h"
@@ skipping 29 matching lines @@
               .GetImageNamed(IDR_MEDIA_ROUTER_WARNING_ICON)),
       current_icon_(&media_router_idle_icon_),
       has_local_route_(false),
       delegate_(nullptr),
       platform_delegate_(MediaRouterActionPlatformDelegate::Create(browser)),
       contextual_menu_(browser) {}
 
 MediaRouterAction::~MediaRouterAction() {
 }
 
-const std::string& MediaRouterAction::GetId() const {
+std::string MediaRouterAction::GetId() const {
   return id_;

[Peter Kasting, 2015/08/21 18:51:55]

You can eliminate |id_| and return
ComponentToolbarActionsFactory::kMediaRouterActionId directly.

[apacible, 2015/08/21 21:11:59]

Done. I was going to do this in a separate patch to split renaming/eliminating
|id_|, but this is small enough.

 }
 
 void MediaRouterAction::SetDelegate(ToolbarActionViewDelegate* delegate) {
   delegate_ = delegate;
 }
 
 gfx::Image MediaRouterAction::GetIcon(content::WebContents* web_contents,
                                       const gfx::Size& size) {
   return *current_icon_;
 }
@@ skipping 107 matching lines @@
   if (issue_) {
     if (issue_->severity() == media_router::Issue::FATAL)
       return &media_router_error_icon_;
     if (issue_->severity() == media_router::Issue::WARNING)
       return &media_router_warning_icon_;
   }
 
   return has_local_route_ ?
       &media_router_active_icon_ : &media_router_idle_icon_;
 }