Index: chrome/browser/plugins/plugin_infobar_delegates.cc |
diff --git a/chrome/browser/plugins/plugin_infobar_delegates.cc b/chrome/browser/plugins/plugin_infobar_delegates.cc |
index 35fb5ff371df55f5aed2d2c3d29e2496916628b9..b9f2504809cd9dcfec008acb7540c0e091a0d0f5 100644 |
--- a/chrome/browser/plugins/plugin_infobar_delegates.cc |
+++ b/chrome/browser/plugins/plugin_infobar_delegates.cc |
@@ -4,6 +4,8 @@ |
#include "chrome/browser/plugins/plugin_infobar_delegates.h" |
+#include <utility> |
+ |
#include "base/bind.h" |
#include "base/path_service.h" |
#include "base/strings/utf_string_conversions.h" |
@@ -60,10 +62,11 @@ void OutdatedPluginInfoBarDelegate::Create( |
base::string16 name(plugin_metadata->name()); |
infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar( |
scoped_ptr<ConfirmInfoBarDelegate>(new OutdatedPluginInfoBarDelegate( |
- installer, plugin_metadata.Pass(), |
+ installer, std::move(plugin_metadata), |
l10n_util::GetStringFUTF16( |
- (installer->state() == PluginInstaller::INSTALLER_STATE_IDLE) ? |
- IDS_PLUGIN_OUTDATED_PROMPT : IDS_PLUGIN_DOWNLOADING, |
+ (installer->state() == PluginInstaller::INSTALLER_STATE_IDLE) |
+ ? IDS_PLUGIN_OUTDATED_PROMPT |
+ : IDS_PLUGIN_DOWNLOADING, |
name))))); |
} |
@@ -74,7 +77,7 @@ OutdatedPluginInfoBarDelegate::OutdatedPluginInfoBarDelegate( |
: ConfirmInfoBarDelegate(), |
WeakPluginInstallerObserver(installer), |
identifier_(plugin_metadata->identifier()), |
- plugin_metadata_(plugin_metadata.Pass()), |
+ plugin_metadata_(std::move(plugin_metadata)), |
message_(message) { |
content::RecordAction(UserMetricsAction("OutdatedPluginInfobar.Shown")); |
std::string name = base::UTF16ToUTF8(plugin_metadata_->name()); |
@@ -211,7 +214,7 @@ void OutdatedPluginInfoBarDelegate::Replace( |
infobar, |
infobar->owner()->CreateConfirmInfoBar( |
scoped_ptr<ConfirmInfoBarDelegate>(new OutdatedPluginInfoBarDelegate( |
- installer, plugin_metadata.Pass(), message)))); |
+ installer, std::move(plugin_metadata), message)))); |
} |
#if defined(OS_WIN) |