[Extensions] Convert APIs to use movable types [4]

Generated extensions code used to rely on linked_ptrs for non-copyable types in
containers. Now, we can make these types movable. Update the following APIs
to use movable types in this CL:
- cryptotoken_private.idl
- dashboard_private.json
- data_reduction_proxy.json
- debugger.json
- declarative_content.json
- desktop_capture.json
- dial.idl
- downloads.idl
- downloads_internal.idl
- easy_unlock_private.idl
- echo_private.json
- enterprise_device_attributes.idl
- enterprise_platform_keys.idl
- enterprise_platform_keys_internal.idl
- enterprise_platform_keys_private.json
- extension.json
- feedback_private.idl

BUG=595949

Review URL: https://codereview.chromium.org/1822303002

Cr-Commit-Position: refs/heads/master@{#383157}

9 files changed, 36 insertions, 48 deletions

diff --git a/chrome/browser/chromeos/feedback_util.cc b/chrome/browser/chromeos/feedback_util.cc
index 18e7e5d..489301fc3 100644
--- a/chrome/browser/chromeos/feedback_util.cc
+++ b/chrome/browser/chromeos/feedback_util.cc
@@ -34,9 +34,9 @@ void OnGetSystemInformation(Profile* profile,
 
   scoped_ptr<FeedbackData::SystemLogsMap> sys_logs(
       new FeedbackData::SystemLogsMap);
-  for (extensions::SystemInformationList::const_iterator it = sys_info.begin();
-       it != sys_info.end(); ++it) {
-    (*sys_logs.get())[it->get()->key] = it->get()->value;
+  for (const extensions::api::feedback_private::SystemInformation& info :
+       sys_info) {
+    (*sys_logs.get())[info.key] = info.value;
   }
   feedback_data->SetAndCompressSystemInfo(std::move(sys_logs));
 
diff --git a/chrome/browser/extensions/api/dashboard_private/dashboard_private_api.cc b/chrome/browser/extensions/api/dashboard_private/dashboard_private_api.cc
index 887bec7..64a9369 100644
--- a/chrome/browser/extensions/api/dashboard_private/dashboard_private_api.cc
+++ b/chrome/browser/extensions/api/dashboard_private/dashboard_private_api.cc
@@ -241,11 +241,11 @@ void DashboardPrivateShowPermissionPromptForDelegatedBundleInstallFunction::
   BundleInstaller::ItemList items;
   for (const auto& entry : params_->contents) {
     BundleInstaller::Item item;
-    item.id = entry->id;
-    item.manifest = entry->manifest;
-    item.localized_name = entry->localized_name;
-    if (entry->icon_url)
-      item.icon_url = source_url().Resolve(*entry->icon_url);
+    item.id = entry.id;
+    item.manifest = entry.manifest;
+    item.localized_name = entry.localized_name;
+    if (entry.icon_url)
+      item.icon_url = source_url().Resolve(*entry.icon_url);
     items.push_back(item);
   }
   if (items.empty()) {
diff --git a/chrome/browser/extensions/api/dial/dial_api.cc b/chrome/browser/extensions/api/dial/dial_api.cc
index a0a36ce..7e48a95 100644
--- a/chrome/browser/extensions/api/dial/dial_api.cc
+++ b/chrome/browser/extensions/api/dial/dial_api.cc
@@ -98,13 +98,11 @@ void DialAPI::OnDialError(const DialRegistry::DialErrorCode code) {
 void DialAPI::SendEventOnUIThread(const DialRegistry::DeviceList& devices) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  std::vector<linked_ptr<api::dial::DialDevice> > args;
-  for (DialRegistry::DeviceList::const_iterator it = devices.begin();
-       it != devices.end(); ++it) {
-    linked_ptr<api::dial::DialDevice> api_device =
-        make_linked_ptr(new api::dial::DialDevice);
-    it->FillDialDevice(api_device.get());
-    args.push_back(api_device);
+  std::vector<api::dial::DialDevice> args;
+  for (const DialDeviceData& device : devices) {
+    api::dial::DialDevice api_device;
+    device.FillDialDevice(&api_device);
+    args.push_back(std::move(api_device));
   }
   scoped_ptr<base::ListValue> results = api::dial::OnDeviceList::Create(args);
   scoped_ptr<Event> event(new Event(events::DIAL_ON_DEVICE_LIST,
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc
index 0a297d2..a765a0e 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -988,12 +988,7 @@ bool DownloadsDownloadFunction::RunAsync() {
     download_params->set_prompt(*options.save_as.get());
 
   if (options.headers.get()) {
-    typedef downloads::HeaderNameValuePair HeaderNameValuePair;
-    for (std::vector<linked_ptr<HeaderNameValuePair> >::const_iterator iter =
-         options.headers->begin();
-         iter != options.headers->end();
-         ++iter) {
-      const HeaderNameValuePair& name_value = **iter;
+    for (const downloads::HeaderNameValuePair& name_value : *options.headers) {
       if (!net::HttpUtil::IsValidHeaderName(name_value.name)) {
         error_ = errors::kInvalidHeaderName;
         return false;
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
index 4558e41..c08e8a4 100644
--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
@@ -11,7 +11,6 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
-#include "base/memory/linked_ptr.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
@@ -673,9 +672,9 @@ bool EasyUnlockPrivateSetRemoteDevicesFunction::RunSync() {
 
   Profile* profile = Profile::FromBrowserContext(browser_context());
   base::ListValue devices;
-  for (size_t i = 0; i < params->devices.size(); ++i) {
-    devices.Append(params->devices[i]->ToValue().release());
-  }
+  for (const easy_unlock_private::Device& device : params->devices)
+    devices.Append(device.ToValue());
+
   // Store the BLE device if we are trying out the BLE experiment.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery)) {
@@ -893,27 +892,25 @@ EasyUnlockPrivateGetUserInfoFunction::~EasyUnlockPrivateGetUserInfoFunction() {
 bool EasyUnlockPrivateGetUserInfoFunction::RunSync() {
   EasyUnlockService* service =
       EasyUnlockService::Get(Profile::FromBrowserContext(browser_context()));
-  std::vector<linked_ptr<easy_unlock_private::UserInfo> > users;
+  std::vector<easy_unlock_private::UserInfo> users;
   const AccountId& account_id = service->GetAccountId();
   if (account_id.is_valid()) {
-    users.push_back(
-        linked_ptr<easy_unlock_private::UserInfo>(
-            new easy_unlock_private::UserInfo()));
-    users[0]->user_id = account_id.GetUserEmail();
-    users[0]->logged_in = service->GetType() == EasyUnlockService::TYPE_REGULAR;
-    users[0]->data_ready = users[0]->logged_in ||
-                           service->GetRemoteDevices() != NULL;
+    easy_unlock_private::UserInfo user;
+    user.user_id = account_id.GetUserEmail();
+    user.logged_in = service->GetType() == EasyUnlockService::TYPE_REGULAR;
+    user.data_ready = user.logged_in || service->GetRemoteDevices() != NULL;
 
     EasyUnlockService::UserSettings user_settings =
         EasyUnlockService::GetUserSettings(account_id);
-    users[0]->require_close_proximity = user_settings.require_close_proximity;
+    user.require_close_proximity = user_settings.require_close_proximity;
 
-    users[0]->device_user_id = proximity_auth::CalculateDeviceUserId(
+    user.device_user_id = proximity_auth::CalculateDeviceUserId(
         EasyUnlockService::GetDeviceId(), account_id.GetUserEmail());
 
-    users[0]->ble_discovery_enabled =
+    user.ble_discovery_enabled =
         base::CommandLine::ForCurrentProcess()->HasSwitch(
             proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery);
+    users.push_back(std::move(user));
   }
   results_ = easy_unlock_private::GetUserInfo::Results::Create(users);
   return true;
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
index 061742f..1772b04 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
+++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
@@ -29,6 +29,7 @@
 #include "ui/base/webui/web_ui_util.h"
 #include "url/url_util.h"
 
+using extensions::api::feedback_private::SystemInformation;
 using feedback::FeedbackData;
 
 namespace {
@@ -235,9 +236,8 @@ bool FeedbackPrivateSendFeedbackFunction::RunAsync() {
       new FeedbackData::SystemLogsMap);
   SystemInformationList* sys_info = feedback_info.system_information.get();
   if (sys_info) {
-    for (SystemInformationList::iterator it = sys_info->begin();
-         it != sys_info->end(); ++it)
-      (*sys_logs.get())[it->get()->key] = it->get()->value;
+    for (const SystemInformation& info : *sys_info)
+      (*sys_logs)[info.key] = info.value;
   }
   feedback_data->SetAndCompressSystemInfo(std::move(sys_logs));
 
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.h b/chrome/browser/extensions/api/feedback_private/feedback_private_api.h
index bf21cfb..bab1831 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.h
+++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.h
@@ -14,8 +14,6 @@ namespace extensions {
 
 class FeedbackService;
 
-using extensions::api::feedback_private::SystemInformation;
-
 class FeedbackPrivateAPI : public BrowserContextKeyedAPI {
  public:
   explicit FeedbackPrivateAPI(content::BrowserContext* context);
@@ -93,7 +91,7 @@ class FeedbackPrivateGetSystemInformationFunction
 
  private:
   void OnCompleted(
-      const std::vector<linked_ptr<SystemInformation> >& sys_info);
+      const std::vector<api::feedback_private::SystemInformation>& sys_info);
 };
 
 class FeedbackPrivateSendFeedbackFunction
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service.cc b/chrome/browser/extensions/api/feedback_private/feedback_service.cc
index 9bd1e5f..13a7cbd 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_service.cc
+++ b/chrome/browser/extensions/api/feedback_private/feedback_service.cc
@@ -15,6 +15,7 @@
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
+using extensions::api::feedback_private::SystemInformation;
 using feedback::FeedbackData;
 
 namespace extensions {
@@ -28,10 +29,10 @@ void PopulateSystemInfo(SystemInformationList* sys_info_list,
   sys_info_value.Set("key", new base::StringValue(key));
   sys_info_value.Set("value", new base::StringValue(value));
 
-  linked_ptr<SystemInformation> sys_info(new SystemInformation());
-  SystemInformation::Populate(sys_info_value, sys_info.get());
+  SystemInformation sys_info;
+  SystemInformation::Populate(sys_info_value, &sys_info);
 
-  sys_info_list->push_back(sys_info);
+  sys_info_list->push_back(std::move(sys_info));
 }
 
 }  // namespace
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service.h b/chrome/browser/extensions/api/feedback_private/feedback_service.h
index d806c77..1921143 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_service.h
+++ b/chrome/browser/extensions/api/feedback_private/feedback_service.h
@@ -20,11 +20,10 @@
 
 class Profile;
 
-using extensions::api::feedback_private::SystemInformation;
-
 namespace extensions {
 
-using SystemInformationList = std::vector<linked_ptr<SystemInformation>>;
+using SystemInformationList =
+    std::vector<api::feedback_private::SystemInformation>;
 
 // The feedback service provides the ability to gather the various pieces of
 // data needed to send a feedback report and then send the report once all