Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr

chrome/browser/extensions/api/tabs/tabs_api.cc

Index: chrome/browser/extensions/api/tabs/tabs_api.cc
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index ab647b17b42a59b2f24eeb3879c234129a87ac2e..f2d0fd9daab8032058b3663bc8e7f703fe6e2c0e 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -202,8 +202,8 @@ bool MatchesBool(bool* boolean, bool value) {
 }
 
 template <typename T>
-void AssignOptionalValue(const scoped_ptr<T>& source,
-                         scoped_ptr<T>& destination) {
+void AssignOptionalValue(const std::unique_ptr<T>& source,
+                         std::unique_ptr<T>& destination) {
   if (source.get()) {
     destination.reset(new T(*source.get()));
   }
@@ -285,7 +285,8 @@ void ZoomModeToZoomSettings(ZoomController::ZoomMode zoom_mode,
 // Windows ---------------------------------------------------------------------
 
 bool WindowsGetFunction::RunSync() {
-  scoped_ptr<windows::Get::Params> params(windows::Get::Params::Create(*args_));
+  std::unique_ptr<windows::Get::Params> params(
+      windows::Get::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   ApiParameterExtractor<windows::Get::Params> extractor(params.get());
@@ -303,7 +304,7 @@ bool WindowsGetFunction::RunSync() {
 }
 
 bool WindowsGetCurrentFunction::RunSync() {
-  scoped_ptr<windows::GetCurrent::Params> params(
+  std::unique_ptr<windows::GetCurrent::Params> params(
       windows::GetCurrent::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
@@ -322,7 +323,7 @@ bool WindowsGetCurrentFunction::RunSync() {
 }
 
 bool WindowsGetLastFocusedFunction::RunSync() {
-  scoped_ptr<windows::GetLastFocused::Params> params(
+  std::unique_ptr<windows::GetLastFocused::Params> params(
       windows::GetLastFocused::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
@@ -351,7 +352,7 @@ bool WindowsGetLastFocusedFunction::RunSync() {
 }
 
 bool WindowsGetAllFunction::RunSync() {
-  scoped_ptr<windows::GetAll::Params> params(
+  std::unique_ptr<windows::GetAll::Params> params(
       windows::GetAll::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
@@ -423,7 +424,7 @@ bool WindowsCreateFunction::ShouldOpenIncognitoWindow(
 }
 
 bool WindowsCreateFunction::RunSync() {
-  scoped_ptr<windows::Create::Params> params(
+  std::unique_ptr<windows::Create::Params> params(
       windows::Create::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
   std::vector<GURL> urls;
@@ -698,7 +699,7 @@ bool WindowsCreateFunction::RunSync() {
 }
 
 bool WindowsUpdateFunction::RunSync() {
-  scoped_ptr<windows::Update::Params> params(
+  std::unique_ptr<windows::Update::Params> params(
       windows::Update::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -802,7 +803,7 @@ bool WindowsUpdateFunction::RunSync() {
 }
 
 bool WindowsRemoveFunction::RunSync() {
-  scoped_ptr<windows::Remove::Params> params(
+  std::unique_ptr<windows::Remove::Params> params(
       windows::Remove::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -829,7 +830,7 @@ bool TabsGetSelectedFunction::RunSync() {
   // windowId defaults to "current" window.
   int window_id = extension_misc::kCurrentWindowId;
 
-  scoped_ptr<tabs::GetSelected::Params> params(
+  std::unique_ptr<tabs::GetSelected::Params> params(
       tabs::GetSelected::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   if (params->window_id.get())
@@ -851,7 +852,7 @@ bool TabsGetSelectedFunction::RunSync() {
 }
 
 bool TabsGetAllInWindowFunction::RunSync() {
-  scoped_ptr<tabs::GetAllInWindow::Params> params(
+  std::unique_ptr<tabs::GetAllInWindow::Params> params(
       tabs::GetAllInWindow::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   // windowId defaults to "current" window.
@@ -869,7 +870,8 @@ bool TabsGetAllInWindowFunction::RunSync() {
 }
 
 bool TabsQueryFunction::RunSync() {
-  scoped_ptr<tabs::Query::Params> params(tabs::Query::Params::Create(*args_));
+  std::unique_ptr<tabs::Query::Params> params(
+      tabs::Query::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   bool loading_status_set = params->query_info.status != tabs::TAB_STATUS_NONE;
@@ -1022,7 +1024,8 @@ bool TabsQueryFunction::RunSync() {
 }
 
 bool TabsCreateFunction::RunSync() {
-  scoped_ptr<tabs::Create::Params> params(tabs::Create::Params::Create(*args_));
+  std::unique_ptr<tabs::Create::Params> params(
+      tabs::Create::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   ExtensionTabUtil::OpenTabParams options;
@@ -1037,7 +1040,7 @@ bool TabsCreateFunction::RunSync() {
   AssignOptionalValue(params->create_properties.url, options.url);
 
   std::string error;
-  scoped_ptr<base::DictionaryValue> result(
+  std::unique_ptr<base::DictionaryValue> result(
       ExtensionTabUtil::OpenTab(this, options, &error));
   if (!result) {
     SetError(error);
@@ -1052,7 +1055,7 @@ bool TabsCreateFunction::RunSync() {
 }
 
 bool TabsDuplicateFunction::RunSync() {
-  scoped_ptr<tabs::Duplicate::Params> params(
+  std::unique_ptr<tabs::Duplicate::Params> params(
       tabs::Duplicate::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   int tab_id = params->tab_id;
@@ -1094,7 +1097,7 @@ bool TabsDuplicateFunction::RunSync() {
 }
 
 bool TabsGetFunction::RunSync() {
-  scoped_ptr<tabs::Get::Params> params(tabs::Get::Params::Create(*args_));
+  std::unique_ptr<tabs::Get::Params> params(tabs::Get::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   int tab_id = params->tab_id;
 
@@ -1130,7 +1133,7 @@ bool TabsGetCurrentFunction::RunSync() {
 }
 
 bool TabsHighlightFunction::RunSync() {
-  scoped_ptr<tabs::Highlight::Params> params(
+  std::unique_ptr<tabs::Highlight::Params> params(
       tabs::Highlight::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
@@ -1200,7 +1203,8 @@ TabsUpdateFunction::TabsUpdateFunction() : web_contents_(NULL) {
 }
 
 bool TabsUpdateFunction::RunAsync() {
-  scoped_ptr<tabs::Update::Params> params(tabs::Update::Params::Create(*args_));
+  std::unique_ptr<tabs::Update::Params> params(
+      tabs::Update::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   int tab_id = -1;
@@ -1401,12 +1405,13 @@ void TabsUpdateFunction::OnExecuteCodeFinished(
 }
 
 bool TabsMoveFunction::RunSync() {
-  scoped_ptr<tabs::Move::Params> params(tabs::Move::Params::Create(*args_));
+  std::unique_ptr<tabs::Move::Params> params(
+      tabs::Move::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   int new_index = params->move_properties.index;
   int* window_id = params->move_properties.window_id.get();
-  scoped_ptr<base::ListValue> tab_values(new base::ListValue());
+  std::unique_ptr<base::ListValue> tab_values(new base::ListValue());
 
   size_t num_tabs = 0;
   if (params->tab_ids.as_integers) {
@@ -1435,7 +1440,7 @@ bool TabsMoveFunction::RunSync() {
     error_ = "No tabs given.";
     return false;
   } else if (num_tabs == 1) {
-    scoped_ptr<base::Value> value;
+    std::unique_ptr<base::Value> value;
     CHECK(tab_values.get()->Remove(0, &value));
     SetResult(value.release());
   } else {
@@ -1550,7 +1555,7 @@ bool TabsMoveFunction::MoveTab(int tab_id,
 }
 
 bool TabsReloadFunction::RunSync() {
-  scoped_ptr<tabs::Reload::Params> params(
+  std::unique_ptr<tabs::Reload::Params> params(
       tabs::Reload::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
@@ -1606,7 +1611,8 @@ bool TabsReloadFunction::RunSync() {
 }
 
 bool TabsRemoveFunction::RunSync() {
-  scoped_ptr<tabs::Remove::Params> params(tabs::Remove::Params::Create(*args_));
+  std::unique_ptr<tabs::Remove::Params> params(
+      tabs::Remove::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   if (params->tab_ids.as_integers) {
@@ -1697,7 +1703,7 @@ bool TabsCaptureVisibleTabFunction::RunAsync() {
   int context_id = extension_misc::kCurrentWindowId;
   args_->GetInteger(0, &context_id);
 
-  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);
@@ -1747,7 +1753,7 @@ void TabsCaptureVisibleTabFunction::RegisterProfilePrefs(
 }
 
 bool TabsDetectLanguageFunction::RunAsync() {
-  scoped_ptr<tabs::DetectLanguage::Params> params(
+  std::unique_ptr<tabs::DetectLanguage::Params> params(
       tabs::DetectLanguage::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
@@ -1869,7 +1875,7 @@ bool ExecuteCodeInTabFunction::Init() {
   base::DictionaryValue* details_value = NULL;
   if (!args_->GetDictionary(1, &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;
 
@@ -2022,7 +2028,7 @@ content::WebContents* ZoomAPIFunction::GetWebContents(int tab_id) {
 }
 
 bool TabsSetZoomFunction::RunAsync() {
-  scoped_ptr<tabs::SetZoom::Params> params(
+  std::unique_ptr<tabs::SetZoom::Params> params(
       tabs::SetZoom::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -2054,7 +2060,7 @@ bool TabsSetZoomFunction::RunAsync() {
 }
 
 bool TabsGetZoomFunction::RunAsync() {
-  scoped_ptr<tabs::GetZoom::Params> params(
+  std::unique_ptr<tabs::GetZoom::Params> params(
       tabs::GetZoom::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -2074,7 +2080,7 @@ bool TabsGetZoomFunction::RunAsync() {
 bool TabsSetZoomSettingsFunction::RunAsync() {
   using api::tabs::ZoomSettings;
 
-  scoped_ptr<tabs::SetZoomSettings::Params> params(
+  std::unique_ptr<tabs::SetZoomSettings::Params> params(
       tabs::SetZoomSettings::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -2124,7 +2130,7 @@ bool TabsSetZoomSettingsFunction::RunAsync() {
 }
 
 bool TabsGetZoomSettingsFunction::RunAsync() {
-  scoped_ptr<tabs::GetZoomSettings::Params> params(
+  std::unique_ptr<tabs::GetZoomSettings::Params> params(
       tabs::GetZoomSettings::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);