Index: chrome/browser/extensions/api/copresence/copresence_api.cc |
diff --git a/chrome/browser/extensions/api/copresence/copresence_api.cc b/chrome/browser/extensions/api/copresence/copresence_api.cc |
index 44bfca7432d3e6677eb04ea0d4898804563bcf52..fad9db79f49dfaa5735f2a889f033f4b339d0db9 100644 |
--- a/chrome/browser/extensions/api/copresence/copresence_api.cc |
+++ b/chrome/browser/extensions/api/copresence/copresence_api.cc |
@@ -92,7 +92,7 @@ void CopresenceService::set_auth_token(const std::string& app_id, |
} |
void CopresenceService::set_manager_for_testing( |
- scoped_ptr<copresence::CopresenceManager> manager) { |
+ std::unique_ptr<copresence::CopresenceManager> manager) { |
manager_ = std::move(manager); |
} |
@@ -148,7 +148,7 @@ void CopresenceService::HandleMessages( |
} |
// Send the messages to the client app. |
- scoped_ptr<Event> event(new Event( |
+ std::unique_ptr<Event> event(new Event( |
events::COPRESENCE_ON_MESSAGES_RECEIVED, OnMessagesReceived::kEventName, |
OnMessagesReceived::Create(subscription_id, api_messages), |
browser_context_)); |
@@ -161,7 +161,7 @@ void CopresenceService::HandleMessages( |
void CopresenceService::HandleStatusUpdate( |
copresence::CopresenceStatus status) { |
DCHECK_EQ(copresence::AUDIO_FAIL, status); |
- scoped_ptr<Event> event(new Event( |
+ std::unique_ptr<Event> event(new Event( |
events::COPRESENCE_ON_STATUS_UPDATED, OnStatusUpdated::kEventName, |
OnStatusUpdated::Create(api::copresence::STATUS_AUDIOFAILED), |
browser_context_)); |
@@ -240,7 +240,7 @@ BrowserContextKeyedAPIFactory<CopresenceService>::DeclareFactoryDependencies() { |
// CopresenceExecuteFunction implementation. |
ExtensionFunction::ResponseAction CopresenceExecuteFunction::Run() { |
- scoped_ptr<Execute::Params> params(Execute::Params::Create(*args_)); |
+ std::unique_ptr<Execute::Params> params(Execute::Params::Create(*args_)); |
EXTENSION_FUNCTION_VALIDATE(params.get()); |
CopresenceService* service = |
@@ -278,7 +278,7 @@ void CopresenceExecuteFunction::SendResult( |
// CopresenceSetApiKeyFunction implementation. |
ExtensionFunction::ResponseAction CopresenceSetApiKeyFunction::Run() { |
- scoped_ptr<SetApiKey::Params> params(SetApiKey::Params::Create(*args_)); |
+ std::unique_ptr<SetApiKey::Params> params(SetApiKey::Params::Create(*args_)); |
EXTENSION_FUNCTION_VALIDATE(params.get()); |
LOG(WARNING) << "copresence.setApiKey() is deprecated. " |
@@ -292,7 +292,8 @@ ExtensionFunction::ResponseAction CopresenceSetApiKeyFunction::Run() { |
// CopresenceSetAuthTokenFunction implementation |
ExtensionFunction::ResponseAction CopresenceSetAuthTokenFunction::Run() { |
- scoped_ptr<SetAuthToken::Params> params(SetAuthToken::Params::Create(*args_)); |
+ std::unique_ptr<SetAuthToken::Params> params( |
+ SetAuthToken::Params::Create(*args_)); |
EXTENSION_FUNCTION_VALIDATE(params.get()); |
// The token may be set to empty, to clear it. |