Replace swap with Pass() on setters in drive_api_parser.

Review URL: https://chromiumcodereview.appspot.com/23979003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221716 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/file_manager/file_tasks_unittest.cc

@@ -170,7 +170,7 @@ TEST(FileManagerFileTasksTest, FindDriveAppTasks) {
   ScopedVector<std::string> foo_mime_types;
   foo_mime_types.push_back(new std::string("text/plain"));
   foo_mime_types.push_back(new std::string("text/html"));
-  foo_app->set_primary_mimetypes(&foo_mime_types);
+  foo_app->set_primary_mimetypes(foo_mime_types.Pass());
 
   // Bar.app can only handle "text/plain".
   scoped_ptr<google_apis::AppResource> bar_app(new google_apis::AppResource);
@@ -181,14 +181,14 @@ TEST(FileManagerFileTasksTest, FindDriveAppTasks) {
   bar_app->set_object_type("bar_object_type");
   ScopedVector<std::string> bar_mime_types;
   bar_mime_types.push_back(new std::string("text/plain"));
-  bar_app->set_primary_mimetypes(&bar_mime_types);
+  bar_app->set_primary_mimetypes(bar_mime_types.Pass());
 
   // Prepare DriveAppRegistry from Foo.app and Bar.app.
   ScopedVector<google_apis::AppResource> app_resources;
   app_resources.push_back(foo_app.release());
   app_resources.push_back(bar_app.release());
   google_apis::AppList app_list;
-  app_list.set_items(&app_resources);
+  app_list.set_items(app_resources.Pass());
   drive::DriveAppRegistry drive_app_registry(NULL);
   drive_app_registry.UpdateFromAppList(app_list);
 

chrome/browser/google_apis/drive_api_parser.cc

@@ -408,22 +408,22 @@ scoped_ptr<AppResource> AppResource::CreateFromInstalledApp(
   {
     ScopedVector<std::string> primary_mimetypes(
         CopyScopedVectorString(installed_app.primary_mimetypes()));
-    resource->set_primary_mimetypes(&primary_mimetypes);
+    resource->set_primary_mimetypes(primary_mimetypes.Pass());
   }
   {
     ScopedVector<std::string> secondary_mimetypes(
         CopyScopedVectorString(installed_app.secondary_mimetypes()));
-    resource->set_secondary_mimetypes(&secondary_mimetypes);
+    resource->set_secondary_mimetypes(secondary_mimetypes.Pass());
   }
   {
     ScopedVector<std::string> primary_file_extensions(
         CopyScopedVectorString(installed_app.primary_extensions()));
-    resource->set_primary_file_extensions(&primary_file_extensions);
+    resource->set_primary_file_extensions(primary_file_extensions.Pass());
   }
   {
     ScopedVector<std::string> secondary_file_extensions(
         CopyScopedVectorString(installed_app.secondary_extensions()));
-    resource->set_secondary_file_extensions(&secondary_file_extensions);
+    resource->set_secondary_file_extensions(secondary_file_extensions.Pass());
   }
 
   {
@@ -433,7 +433,7 @@ scoped_ptr<AppResource> AppResource::CreateFromInstalledApp(
     for (size_t i = 0; i < app_icons.size(); ++i) {
       icons.push_back(DriveAppIcon::CreateFromAppIcon(*app_icons[i]).release());
     }
-    resource->set_icons(&icons);
+    resource->set_icons(icons.Pass());
   }
 
   // supports_import, installed and authorized are not supported in
@@ -490,7 +490,7 @@ scoped_ptr<AppList> AppList::CreateFromAccountMetadata(
     app_resources.push_back(
         AppResource::CreateFromInstalledApp(*installed_apps[i]).release());
   }
-  resource->set_items(&app_resources);
+  resource->set_items(app_resources.Pass());
 
   // etag is not supported in AccountMetadata.
 

chrome/browser/google_apis/drive_api_parser.h

@@ -265,23 +265,23 @@ class AppResource {
     product_url_ = product_url;
   }
   void set_primary_mimetypes(
-      ScopedVector<std::string>* primary_mimetypes) {
-    primary_mimetypes_.swap(*primary_mimetypes);
+      ScopedVector<std::string> primary_mimetypes) {
+    primary_mimetypes_ = primary_mimetypes.Pass();
   }
   void set_secondary_mimetypes(
-      ScopedVector<std::string>* secondary_mimetypes) {
-    secondary_mimetypes_.swap(*secondary_mimetypes);
+      ScopedVector<std::string> secondary_mimetypes) {
+    secondary_mimetypes_ = secondary_mimetypes.Pass();
   }
   void set_primary_file_extensions(
-      ScopedVector<std::string>* primary_file_extensions) {
-    primary_file_extensions_.swap(*primary_file_extensions);
+      ScopedVector<std::string> primary_file_extensions) {
+    primary_file_extensions_ = primary_file_extensions.Pass();
   }
   void set_secondary_file_extensions(
-      ScopedVector<std::string>* secondary_file_extensions) {
-    secondary_file_extensions_.swap(*secondary_file_extensions);
+      ScopedVector<std::string> secondary_file_extensions) {
+    secondary_file_extensions_ = secondary_file_extensions.Pass();
   }
-  void set_icons(ScopedVector<DriveAppIcon>* icons) {
-    icons_.swap(*icons);
+  void set_icons(ScopedVector<DriveAppIcon> icons) {
+    icons_ = icons.Pass();
   }
 
  private:
@@ -339,8 +339,8 @@ class AppList {
   void set_etag(const std::string& etag) {
     etag_ = etag;
   }
-  void set_items(ScopedVector<AppResource>* items) {
-    items_.swap(*items);
+  void set_items(ScopedVector<AppResource> items) {
+    items_ = items.Pass();
   }
 
  private:
@@ -603,8 +603,8 @@ class FileResource {
   void set_embed_link(const GURL& embed_link) {
     embed_link_ = embed_link;
   }
-  void set_parents(ScopedVector<ParentReference>* parents) {
-    parents_.swap(*parents);
+  void set_parents(ScopedVector<ParentReference> parents) {
+    parents_ = parents.Pass();
   }
   void set_thumbnail_link(const GURL& thumbnail_link) {
     thumbnail_link_ = thumbnail_link;
@@ -688,8 +688,8 @@ class FileList {
   void set_next_link(const GURL& next_link) {
     next_link_ = next_link;
   }
-  void set_items(ScopedVector<FileResource>* items) {
-    items_.swap(*items);
+  void set_items(ScopedVector<FileResource> items) {
+    items_ = items.Pass();
   }
 
  private:
@@ -812,8 +812,8 @@ class ChangeList {
   void set_largest_change_id(int64 largest_change_id) {
     largest_change_id_ = largest_change_id;
   }
-  void set_items(ScopedVector<ChangeResource>* items) {
-    items_.swap(*items);
+  void set_items(ScopedVector<ChangeResource> items) {
+    items_ = items.Pass();
   }
 
  private:

chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc

@@ -404,7 +404,7 @@ class MetadataDatabaseTest : public testing::Test {
     }
 
     file_resource->set_file_id(file.file_id());
-    file_resource->set_parents(&parents);
+    file_resource->set_parents(parents.Pass());
     file_resource->set_title(file.details().title());
     if (file.details().file_kind() == FILE_KIND_FOLDER)
       file_resource->set_mime_type("application/vnd.google-apps.folder");