Commit 512baf26 authored by ratsunny's avatar ratsunny Committed by Commit bot

Replace unique_ptr.reset/release with std::move under src/extensions

BUG=644626

Review-Url: https://codereview.chromium.org/2551723002
Cr-Commit-Position: refs/heads/master@{#437542}
parent dbb37764
...@@ -309,7 +309,7 @@ void AlarmManager::WriteToStorage(const std::string& extension_id) { ...@@ -309,7 +309,7 @@ void AlarmManager::WriteToStorage(const std::string& extension_id) {
if (list != alarms_.end()) if (list != alarms_.end())
alarms = AlarmsToValue(list->second); alarms = AlarmsToValue(list->second);
else else
alarms.reset(AlarmsToValue(AlarmList()).release()); alarms = AlarmsToValue(AlarmList());
storage->SetExtensionValue(extension_id, kRegisteredAlarms, storage->SetExtensionValue(extension_id, kRegisteredAlarms,
std::move(alarms)); std::move(alarms));
} }
......
...@@ -99,7 +99,7 @@ bool CastMessageToMessageInfo(const CastMessage& message_proto, ...@@ -99,7 +99,7 @@ bool CastMessageToMessageInfo(const CastMessage& message_proto,
} }
if (value.get()) { if (value.get()) {
DCHECK(!message->data.get()); DCHECK(!message->data.get());
message->data.reset(value.release()); message->data = std::move(value);
return true; return true;
} else { } else {
return false; return false;
......
...@@ -104,7 +104,7 @@ class NetworkingPrivateDelegate : public KeyedService { ...@@ -104,7 +104,7 @@ class NetworkingPrivateDelegate : public KeyedService {
~NetworkingPrivateDelegate() override; ~NetworkingPrivateDelegate() override;
void set_ui_delegate(std::unique_ptr<UIDelegate> ui_delegate) { void set_ui_delegate(std::unique_ptr<UIDelegate> ui_delegate) {
ui_delegate_.reset(ui_delegate.release()); ui_delegate_ = std::move(ui_delegate);
} }
const UIDelegate* ui_delegate() { return ui_delegate_.get(); } const UIDelegate* ui_delegate() { return ui_delegate_.get(); }
......
...@@ -59,12 +59,12 @@ NetworkingPrivateDelegateFactory::~NetworkingPrivateDelegateFactory() { ...@@ -59,12 +59,12 @@ NetworkingPrivateDelegateFactory::~NetworkingPrivateDelegateFactory() {
void NetworkingPrivateDelegateFactory::SetVerifyDelegateFactory( void NetworkingPrivateDelegateFactory::SetVerifyDelegateFactory(
std::unique_ptr<VerifyDelegateFactory> factory) { std::unique_ptr<VerifyDelegateFactory> factory) {
verify_factory_.reset(factory.release()); verify_factory_ = std::move(factory);
} }
void NetworkingPrivateDelegateFactory::SetUIDelegateFactory( void NetworkingPrivateDelegateFactory::SetUIDelegateFactory(
std::unique_ptr<UIDelegateFactory> factory) { std::unique_ptr<UIDelegateFactory> factory) {
ui_factory_.reset(factory.release()); ui_factory_ = std::move(factory);
} }
KeyedService* NetworkingPrivateDelegateFactory::BuildServiceInstanceFor( KeyedService* NetworkingPrivateDelegateFactory::BuildServiceInstanceFor(
......
...@@ -2299,9 +2299,9 @@ WebRequestInternalEventHandledFunction::Run() { ...@@ -2299,9 +2299,9 @@ WebRequestInternalEventHandledFunction::Run() {
response_headers->push_back(helpers::ResponseHeader(name, value)); response_headers->push_back(helpers::ResponseHeader(name, value));
} }
if (has_request_headers) if (has_request_headers)
response->request_headers.reset(request_headers.release()); response->request_headers = std::move(request_headers);
else else
response->response_headers.reset(response_headers.release()); response->response_headers = std::move(response_headers);
} }
if (value->HasKey(keys::kAuthCredentialsKey)) { if (value->HasKey(keys::kAuthCredentialsKey)) {
......
...@@ -112,8 +112,8 @@ void RequestQueue<T>::StartNextRequest() { ...@@ -112,8 +112,8 @@ void RequestQueue<T>::StartNextRequest() {
std::pop_heap( std::pop_heap(
pending_requests_.begin(), pending_requests_.end(), CompareRequests); pending_requests_.begin(), pending_requests_.end(), CompareRequests);
active_backoff_entry_.reset(pending_requests_.back().backoff_entry.release()); active_backoff_entry_ = std::move(pending_requests_.back().backoff_entry);
active_request_.reset(pending_requests_.back().request.release()); active_request_ = std::move(pending_requests_.back().request);
pending_requests_.pop_back(); pending_requests_.pop_back();
......
...@@ -359,7 +359,7 @@ void UserScriptLoader::SetReady(bool ready) { ...@@ -359,7 +359,7 @@ void UserScriptLoader::SetReady(bool ready) {
void UserScriptLoader::OnScriptsLoaded( void UserScriptLoader::OnScriptsLoaded(
std::unique_ptr<UserScriptList> user_scripts, std::unique_ptr<UserScriptList> user_scripts,
std::unique_ptr<base::SharedMemory> shared_memory) { std::unique_ptr<base::SharedMemory> shared_memory) {
user_scripts_.reset(user_scripts.release()); user_scripts_ = std::move(user_scripts);
if (pending_load_) { if (pending_load_) {
// While we were loading, there were further changes. Don't bother // While we were loading, there were further changes. Don't bother
// notifying about these scripts and instead just immediately reload. // notifying about these scripts and instead just immediately reload.
...@@ -381,7 +381,7 @@ void UserScriptLoader::OnScriptsLoaded( ...@@ -381,7 +381,7 @@ void UserScriptLoader::OnScriptsLoaded(
} }
// We've got scripts ready to go. // We've got scripts ready to go.
shared_memory_.reset(shared_memory.release()); shared_memory_ = std::move(shared_memory);
for (content::RenderProcessHost::iterator i( for (content::RenderProcessHost::iterator i(
content::RenderProcessHost::AllHostsIterator()); content::RenderProcessHost::AllHostsIterator());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment