| Index: chrome/browser/extensions/extension_management.cc
|
| diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
|
| index 202a1bd0be2ac4c99577889a157c7cb46c975370..a048162838475464e8d88b0641a242678f452ac0 100644
|
| --- a/chrome/browser/extensions/extension_management.cc
|
| +++ b/chrome/browser/extensions/extension_management.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/extensions/extension_management.h"
|
|
|
| #include <algorithm>
|
| +#include <utility>
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| @@ -115,7 +116,7 @@ scoped_ptr<base::DictionaryValue> ExtensionManagement::GetForceInstallList()
|
| install_list.get(), it->first, it->second->update_url);
|
| }
|
| }
|
| - return install_list.Pass();
|
| + return install_list;
|
| }
|
|
|
| scoped_ptr<base::DictionaryValue>
|
| @@ -129,7 +130,7 @@ ExtensionManagement::GetRecommendedInstallList() const {
|
| install_list.get(), it->first, it->second->update_url);
|
| }
|
| }
|
| - return install_list.Pass();
|
| + return install_list;
|
| }
|
|
|
| bool ExtensionManagement::IsInstallationExplicitlyAllowed(
|
| @@ -442,7 +443,7 @@ internal::IndividualSettings* ExtensionManagement::AccessById(
|
| if (it == settings_by_id_.end()) {
|
| scoped_ptr<internal::IndividualSettings> settings(
|
| new internal::IndividualSettings(default_settings_.get()));
|
| - it = settings_by_id_.add(id, settings.Pass()).first;
|
| + it = settings_by_id_.add(id, std::move(settings)).first;
|
| }
|
| return it->second;
|
| }
|
| @@ -454,7 +455,7 @@ internal::IndividualSettings* ExtensionManagement::AccessByUpdateUrl(
|
| if (it == settings_by_update_url_.end()) {
|
| scoped_ptr<internal::IndividualSettings> settings(
|
| new internal::IndividualSettings(default_settings_.get()));
|
| - it = settings_by_update_url_.add(update_url, settings.Pass()).first;
|
| + it = settings_by_update_url_.add(update_url, std::move(settings)).first;
|
| }
|
| return it->second;
|
| }
|
|
|