| Index: chrome/browser/plugins/plugin_observer.cc
|
| diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc
|
| index 4285ab6b6d7aa1f2cf5b5a52e6d6b0a15321b58f..402abaed90a823283fd336a7db94925531835861 100644
|
| --- a/chrome/browser/plugins/plugin_observer.cc
|
| +++ b/chrome/browser/plugins/plugin_observer.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chrome/browser/plugins/plugin_observer.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/auto_reset.h"
|
| #include "base/bind.h"
|
| #include "base/debug/crash_logging.h"
|
| @@ -90,8 +92,7 @@ ConfirmInstallDialogDelegate::ConfirmInstallDialogDelegate(
|
| : TabModalConfirmDialogDelegate(web_contents),
|
| WeakPluginInstallerObserver(installer),
|
| web_contents_(web_contents),
|
| - plugin_metadata_(plugin_metadata.Pass()) {
|
| -}
|
| + plugin_metadata_(std::move(plugin_metadata)) {}
|
|
|
| base::string16 ConfirmInstallDialogDelegate::GetTitle() {
|
| return l10n_util::GetStringFUTF16(
|
| @@ -382,8 +383,9 @@ void PluginObserver::OnBlockedOutdatedPlugin(int placeholder_id,
|
| if (finder->FindPluginWithIdentifier(identifier, &installer, &plugin)) {
|
| plugin_placeholders_[placeholder_id] = new PluginPlaceholderHost(
|
| this, placeholder_id, plugin->name(), installer);
|
| - OutdatedPluginInfoBarDelegate::Create(InfoBarService::FromWebContents(
|
| - web_contents()), installer, plugin.Pass());
|
| + OutdatedPluginInfoBarDelegate::Create(
|
| + InfoBarService::FromWebContents(web_contents()), installer,
|
| + std::move(plugin));
|
| } else {
|
| NOTREACHED();
|
| }
|
|
|