| Index: extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
|
| diff --git a/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc b/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
|
| index e33962dbe2e3d721a5ac5b4142ca903b004b2268..f1ffb063ee9225ada095a54848bff22fe3be6e3c 100644
|
| --- a/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
|
| +++ b/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
|
| @@ -266,11 +266,11 @@ bool WebViewInternalCaptureVisibleRegionFunction::RunAsyncSafe(
|
| WebViewGuest* guest) {
|
| using api::extension_types::ImageDetails;
|
|
|
| - scoped_ptr<web_view_internal::CaptureVisibleRegion::Params> params(
|
| + std::unique_ptr<web_view_internal::CaptureVisibleRegion::Params> params(
|
| web_view_internal::CaptureVisibleRegion::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| - scoped_ptr<ImageDetails> image_details;
|
| + std::unique_ptr<ImageDetails> image_details;
|
| if (args_->GetSize() > 1) {
|
| base::Value* spec = NULL;
|
| EXTENSION_FUNCTION_VALIDATE(args_->Get(1, &spec) && spec);
|
| @@ -324,7 +324,7 @@ void WebViewInternalCaptureVisibleRegionFunction::OnCaptureFailure(
|
| }
|
|
|
| bool WebViewInternalNavigateFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| - scoped_ptr<web_view_internal::Navigate::Params> params(
|
| + std::unique_ptr<web_view_internal::Navigate::Params> params(
|
| web_view_internal::Navigate::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| std::string src = params->src;
|
| @@ -362,7 +362,7 @@ bool WebViewInternalExecuteCodeFunction::Init() {
|
| base::DictionaryValue* details_value = NULL;
|
| if (!args_->GetDictionary(2, &details_value))
|
| return false;
|
| - scoped_ptr<InjectDetails> details(new InjectDetails());
|
| + std::unique_ptr<InjectDetails> details(new InjectDetails());
|
| if (!InjectDetails::Populate(*details_value, details.get()))
|
| return false;
|
|
|
| @@ -476,7 +476,7 @@ WebViewInternalAddContentScriptsFunction::
|
|
|
| ExecuteCodeFunction::ResponseAction
|
| WebViewInternalAddContentScriptsFunction::Run() {
|
| - scoped_ptr<web_view_internal::AddContentScripts::Params> params(
|
| + std::unique_ptr<web_view_internal::AddContentScripts::Params> params(
|
| web_view_internal::AddContentScripts::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -516,7 +516,7 @@ WebViewInternalRemoveContentScriptsFunction::
|
|
|
| ExecuteCodeFunction::ResponseAction
|
| WebViewInternalRemoveContentScriptsFunction::Run() {
|
| - scoped_ptr<web_view_internal::RemoveContentScripts::Params> params(
|
| + std::unique_ptr<web_view_internal::RemoveContentScripts::Params> params(
|
| web_view_internal::RemoveContentScripts::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -546,7 +546,7 @@ WebViewInternalSetNameFunction::~WebViewInternalSetNameFunction() {
|
| }
|
|
|
| bool WebViewInternalSetNameFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| - scoped_ptr<web_view_internal::SetName::Params> params(
|
| + std::unique_ptr<web_view_internal::SetName::Params> params(
|
| web_view_internal::SetName::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| guest->SetName(params->frame_name);
|
| @@ -564,7 +564,7 @@ WebViewInternalSetAllowTransparencyFunction::
|
|
|
| bool WebViewInternalSetAllowTransparencyFunction::RunAsyncSafe(
|
| WebViewGuest* guest) {
|
| - scoped_ptr<web_view_internal::SetAllowTransparency::Params> params(
|
| + std::unique_ptr<web_view_internal::SetAllowTransparency::Params> params(
|
| web_view_internal::SetAllowTransparency::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| guest->SetAllowTransparency(params->allow);
|
| @@ -581,7 +581,7 @@ WebViewInternalSetAllowScalingFunction::
|
| }
|
|
|
| bool WebViewInternalSetAllowScalingFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| - scoped_ptr<web_view_internal::SetAllowScaling::Params> params(
|
| + std::unique_ptr<web_view_internal::SetAllowScaling::Params> params(
|
| web_view_internal::SetAllowScaling::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| guest->SetAllowScaling(params->allow);
|
| @@ -596,7 +596,7 @@ WebViewInternalSetZoomFunction::~WebViewInternalSetZoomFunction() {
|
| }
|
|
|
| bool WebViewInternalSetZoomFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| - scoped_ptr<web_view_internal::SetZoom::Params> params(
|
| + std::unique_ptr<web_view_internal::SetZoom::Params> params(
|
| web_view_internal::SetZoom::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| guest->SetZoom(params->zoom_factor);
|
| @@ -612,7 +612,7 @@ WebViewInternalGetZoomFunction::~WebViewInternalGetZoomFunction() {
|
| }
|
|
|
| bool WebViewInternalGetZoomFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| - scoped_ptr<web_view_internal::GetZoom::Params> params(
|
| + std::unique_ptr<web_view_internal::GetZoom::Params> params(
|
| web_view_internal::GetZoom::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -629,7 +629,7 @@ WebViewInternalSetZoomModeFunction::~WebViewInternalSetZoomModeFunction() {
|
| }
|
|
|
| bool WebViewInternalSetZoomModeFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| - scoped_ptr<web_view_internal::SetZoomMode::Params> params(
|
| + std::unique_ptr<web_view_internal::SetZoomMode::Params> params(
|
| web_view_internal::SetZoomMode::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -661,7 +661,7 @@ WebViewInternalGetZoomModeFunction::~WebViewInternalGetZoomModeFunction() {
|
| }
|
|
|
| bool WebViewInternalGetZoomModeFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| - scoped_ptr<web_view_internal::GetZoomMode::Params> params(
|
| + std::unique_ptr<web_view_internal::GetZoomMode::Params> params(
|
| web_view_internal::GetZoomMode::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -692,7 +692,7 @@ WebViewInternalFindFunction::~WebViewInternalFindFunction() {
|
| }
|
|
|
| bool WebViewInternalFindFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| - scoped_ptr<web_view_internal::Find::Params> params(
|
| + std::unique_ptr<web_view_internal::Find::Params> params(
|
| web_view_internal::Find::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -721,7 +721,7 @@ WebViewInternalStopFindingFunction::~WebViewInternalStopFindingFunction() {
|
| }
|
|
|
| bool WebViewInternalStopFindingFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| - scoped_ptr<web_view_internal::StopFinding::Params> params(
|
| + std::unique_ptr<web_view_internal::StopFinding::Params> params(
|
| web_view_internal::StopFinding::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -755,7 +755,7 @@ WebViewInternalLoadDataWithBaseUrlFunction::
|
|
|
| bool WebViewInternalLoadDataWithBaseUrlFunction::RunAsyncSafe(
|
| WebViewGuest* guest) {
|
| - scoped_ptr<web_view_internal::LoadDataWithBaseUrl::Params> params(
|
| + std::unique_ptr<web_view_internal::LoadDataWithBaseUrl::Params> params(
|
| web_view_internal::LoadDataWithBaseUrl::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -777,7 +777,7 @@ WebViewInternalGoFunction::~WebViewInternalGoFunction() {
|
| }
|
|
|
| bool WebViewInternalGoFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| - scoped_ptr<web_view_internal::Go::Params> params(
|
| + std::unique_ptr<web_view_internal::Go::Params> params(
|
| web_view_internal::Go::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -805,7 +805,7 @@ WebViewInternalSetPermissionFunction::~WebViewInternalSetPermissionFunction() {
|
| }
|
|
|
| bool WebViewInternalSetPermissionFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| - scoped_ptr<web_view_internal::SetPermission::Params> params(
|
| + std::unique_ptr<web_view_internal::SetPermission::Params> params(
|
| web_view_internal::SetPermission::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -854,7 +854,7 @@ WebViewInternalOverrideUserAgentFunction::
|
|
|
| bool WebViewInternalOverrideUserAgentFunction::RunAsyncSafe(
|
| WebViewGuest* guest) {
|
| - scoped_ptr<web_view_internal::OverrideUserAgent::Params> params(
|
| + std::unique_ptr<web_view_internal::OverrideUserAgent::Params> params(
|
| web_view_internal::OverrideUserAgent::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
|
|