Convert Pass()→std::move() in //chrome/browser/extensions

chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Implements the Chrome Extensions Media Galleries API.
 
 #include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h"
 
 #include <stddef.h>
-
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 319 matching lines @@
 
 bool MediaGalleriesEventRouter::ExtensionHasScanProgressListener(
     const std::string& extension_id) const {
   return EventRouter::Get(profile_)->ExtensionHasEventListener(
       extension_id, MediaGalleries::OnScanProgress::kEventName);
 }
 
 void MediaGalleriesEventRouter::OnScanStarted(const std::string& extension_id) {
   MediaGalleries::ScanProgressDetails details;
   details.type = MediaGalleries::SCAN_PROGRESS_TYPE_START;
-  DispatchEventToExtension(
-      extension_id, events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
-      MediaGalleries::OnScanProgress::kEventName,
-      MediaGalleries::OnScanProgress::Create(details).Pass());
+  DispatchEventToExtension(extension_id,
+                           events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
+                           MediaGalleries::OnScanProgress::kEventName,
+                           MediaGalleries::OnScanProgress::Create(details));
 }
 
 void MediaGalleriesEventRouter::OnScanCancelled(
     const std::string& extension_id) {
   MediaGalleries::ScanProgressDetails details;
   details.type = MediaGalleries::SCAN_PROGRESS_TYPE_CANCEL;
-  DispatchEventToExtension(
-      extension_id, events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
-      MediaGalleries::OnScanProgress::kEventName,
-      MediaGalleries::OnScanProgress::Create(details).Pass());
+  DispatchEventToExtension(extension_id,
+                           events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
+                           MediaGalleries::OnScanProgress::kEventName,
+                           MediaGalleries::OnScanProgress::Create(details));
 }
 
 void MediaGalleriesEventRouter::OnScanFinished(
     const std::string& extension_id, int gallery_count,
     const MediaGalleryScanResult& file_counts) {
   media_galleries::UsageCount(media_galleries::SCAN_FINISHED);
   MediaGalleries::ScanProgressDetails details;
   details.type = MediaGalleries::SCAN_PROGRESS_TYPE_FINISH;
   details.gallery_count.reset(new int(gallery_count));
   details.audio_count.reset(new int(file_counts.audio_count));
   details.image_count.reset(new int(file_counts.image_count));
   details.video_count.reset(new int(file_counts.video_count));
-  DispatchEventToExtension(
-      extension_id, events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
-      MediaGalleries::OnScanProgress::kEventName,
-      MediaGalleries::OnScanProgress::Create(details).Pass());
+  DispatchEventToExtension(extension_id,
+                           events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
+                           MediaGalleries::OnScanProgress::kEventName,
+                           MediaGalleries::OnScanProgress::Create(details));
 }
 
 void MediaGalleriesEventRouter::OnScanError(
     const std::string& extension_id) {
   MediaGalleries::ScanProgressDetails details;
   details.type = MediaGalleries::SCAN_PROGRESS_TYPE_ERROR;
-  DispatchEventToExtension(
-      extension_id, events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
-      MediaGalleries::OnScanProgress::kEventName,
-      MediaGalleries::OnScanProgress::Create(details).Pass());
+  DispatchEventToExtension(extension_id,
+                           events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
+                           MediaGalleries::OnScanProgress::kEventName,
+                           MediaGalleries::OnScanProgress::Create(details));
 }
 
 void MediaGalleriesEventRouter::DispatchEventToExtension(
     const std::string& extension_id,
     events::HistogramValue histogram_value,
     const std::string& event_name,
     scoped_ptr<base::ListValue> event_args) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // TODO(tommycli): Remove these CHECKs after fixing https://crbug.com/467627.
   CHECK(profile_);
   EventRouter* router = EventRouter::Get(profile_);
   CHECK(router);
 
   if (!router->ExtensionHasEventListener(extension_id, event_name))
     return;
 
-  scoped_ptr<extensions::Event> event(
-      new extensions::Event(histogram_value, event_name, event_args.Pass()));
-  router->DispatchEventToExtension(extension_id, event.Pass());
+  scoped_ptr<extensions::Event> event(new extensions::Event(
+      histogram_value, event_name, std::move(event_args)));
+  router->DispatchEventToExtension(extension_id, std::move(event));
 }
 
 void MediaGalleriesEventRouter::OnGalleryChanged(
     const std::string& extension_id, MediaGalleryPrefId gallery_id) {
   MediaGalleries::GalleryChangeDetails details;
   details.type = MediaGalleries::GALLERY_CHANGE_TYPE_CONTENTS_CHANGED;
   details.gallery_id = base::Uint64ToString(gallery_id);
-  DispatchEventToExtension(
-      extension_id, events::MEDIA_GALLERIES_ON_GALLERY_CHANGED,
-      MediaGalleries::OnGalleryChanged::kEventName,
-      MediaGalleries::OnGalleryChanged::Create(details).Pass());
+  DispatchEventToExtension(extension_id,
+                           events::MEDIA_GALLERIES_ON_GALLERY_CHANGED,
+                           MediaGalleries::OnGalleryChanged::kEventName,
+                           MediaGalleries::OnGalleryChanged::Create(details));
 }
 
 void MediaGalleriesEventRouter::OnGalleryWatchDropped(
     const std::string& extension_id, MediaGalleryPrefId gallery_id) {
   MediaGalleries::GalleryChangeDetails details;
   details.type = MediaGalleries::GALLERY_CHANGE_TYPE_WATCH_DROPPED;
   details.gallery_id = gallery_id;
-  DispatchEventToExtension(
-      extension_id, events::MEDIA_GALLERIES_ON_GALLERY_CHANGED,
-      MediaGalleries::OnGalleryChanged::kEventName,
-      MediaGalleries::OnGalleryChanged::Create(details).Pass());
+  DispatchEventToExtension(extension_id,
+                           events::MEDIA_GALLERIES_ON_GALLERY_CHANGED,
+                           MediaGalleries::OnGalleryChanged::kEventName,
+                           MediaGalleries::OnGalleryChanged::Create(details));
 }
 
 void MediaGalleriesEventRouter::OnListenerRemoved(
     const EventListenerInfo& details) {
   if (details.event_name == MediaGalleries::OnGalleryChanged::kEventName &&
       !ExtensionHasGalleryChangeListener(details.extension_id)) {
     gallery_watch_manager()->RemoveAllWatches(profile_, details.extension_id);
   }
 }
 
@@ skipping 596 matching lines @@
   attached_image->Set(kTypeKey, new base::StringValue(
       current_image->type));
   attached_image->Set(kSizeKey, new base::FundamentalValue(
       base::checked_cast<int>(current_image->data.size())));
   attached_images_list->Append(attached_image);
 
   blob_uuids->push_back(current_blob->GetUUID());
   extensions::BlobHolder* holder =
       extensions::BlobHolder::FromRenderProcessHost(
           render_frame_host()->GetProcess());
-  holder->HoldBlobReference(current_blob.Pass());
+  holder->HoldBlobReference(std::move(current_blob));
 
   // Construct the next Blob if necessary.
   if (blob_uuids->size() < attached_images->size()) {
     metadata::AttachedImage* next_image =
         &(*attached_images)[blob_uuids->size()];
     content::BrowserContext::CreateMemoryBackedBlob(
         GetProfile(),
         next_image->data.c_str(),
         next_image->data.size(),
         base::Bind(&MediaGalleriesGetMetadataFunction::ConstructNextBlob,
@@ skipping 194 matching lines @@
       &MediaGalleriesRemoveAllGalleryWatchFunction::OnPreferencesInit, this));
   return true;
 }
 
 void MediaGalleriesRemoveAllGalleryWatchFunction::OnPreferencesInit() {
   gallery_watch_manager()->RemoveAllWatches(GetProfile(), extension_id());
   SendResponse(true);
 }
 
 }  // namespace extensions