Convert Pass()→std::move() in //chrome/browser/ui

chrome/browser/ui/extensions/extension_action_view_controller.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 "chrome/browser/ui/extensions/extension_action_view_controller.h"
 
+#include <utility>
+
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_view.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/extensions/extension_view_host_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
@@ skipping 297 matching lines @@
   if (toolbar_actions_bar_)
     toolbar_actions_bar_->SetPopupOwner(this);
 
   if (toolbar_actions_bar_ &&
       !toolbar_actions_bar_->IsActionVisibleOnMainBar(this) &&
       extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {
     platform_delegate_->CloseOverflowMenu();
     toolbar_actions_bar_->PopOutAction(
         this,
         base::Bind(&ExtensionActionViewController::ShowPopup,
-                   weak_factory_.GetWeakPtr(),
-                   base::Passed(host.Pass()),
-                   grant_tab_permissions,
-                   show_action));
+                   weak_factory_.GetWeakPtr(), base::Passed(std::move(host)),
+                   grant_tab_permissions, show_action));
   } else {
-    ShowPopup(host.Pass(), grant_tab_permissions, show_action);
+    ShowPopup(std::move(host), grant_tab_permissions, show_action);
   }
 
   return true;
 }
 
 void ExtensionActionViewController::ShowPopup(
     scoped_ptr<extensions::ExtensionViewHost> popup_host,
     bool grant_tab_permissions,
     PopupShowAction show_action) {
   // It's possible that the popup should be closed before it finishes opening
   // (since it can open asynchronously). Check before proceeding.
   if (!popup_host_)
     return;
-  platform_delegate_->ShowPopup(
-      popup_host.Pass(), grant_tab_permissions, show_action);
+  platform_delegate_->ShowPopup(std::move(popup_host), grant_tab_permissions,
+                                show_action);
   view_delegate_->OnPopupShown(grant_tab_permissions);
 }
 
 void ExtensionActionViewController::OnPopupClosed() {
   popup_host_observer_.Remove(popup_host_);
   popup_host_ = nullptr;
   if (toolbar_actions_bar_) {
     toolbar_actions_bar_->SetPopupOwner(nullptr);
     if (toolbar_actions_bar_->popped_out_action() == this &&
         !view_delegate_->IsMenuRunning())
@@ skipping 13 matching lines @@
   image_source->SetIcon(icon_factory_.GetIcon(tab_id));
 
   scoped_ptr<IconWithBadgeImageSource::Badge> badge;
   std::string badge_text = extension_action_->GetBadgeText(tab_id);
   if (!badge_text.empty()) {
     badge.reset(new IconWithBadgeImageSource::Badge(
             badge_text,
             extension_action_->GetBadgeTextColor(tab_id),
             extension_action_->GetBadgeBackgroundColor(tab_id)));
   }
-  image_source->SetBadge(badge.Pass());
+  image_source->SetBadge(std::move(badge));
 
   // Greyscaling disabled actions and having a special wants-to-run decoration
   // are gated on the toolbar redesign.
   if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {
     // If the extension doesn't want to run on the active web contents, we
     // grayscale it to indicate that.
     image_source->set_grayscale(!IsEnabled(web_contents));
     // If the action *does* want to run on the active web contents and is also
     // overflowed, we add a decoration so that the user can see which overflowed
     // action wants to run (since they wouldn't be able to see the change from
     // grayscale to color).
     bool is_overflow =
         toolbar_actions_bar_ && toolbar_actions_bar_->in_overflow_mode();
     image_source->set_paint_decoration(WantsToRun(web_contents) && is_overflow);
   }
 
-  return image_source.Pass();
+  return image_source;
 }