Convert Pass()→std::move() in //content/browser

content/browser/download/download_net_log_parameters.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.
 
 #include "content/browser/download/download_net_log_parameters.h"
 
+#include <utility>
+
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "net/base/net_errors.h"
 #include "url/gurl.h"
 
 namespace content {
@@ skipping 35 matching lines @@
   dict->SetString("id", base::UintToString(download_item->GetId()));
   dict->SetString("original_url", download_item->GetOriginalUrl().spec());
   dict->SetString("final_url", download_item->GetURL().spec());
   dict->SetString("file_name", *file_name);
   dict->SetString("danger_type",
                   download_danger_names[download_item->GetDangerType()]);
   dict->SetString("start_offset",
                   base::Int64ToString(download_item->GetReceivedBytes()));
   dict->SetBoolean("has_user_gesture", download_item->HasUserGesture());
 
-  return dict.Pass();
+  return std::move(dict);
 }
 
 scoped_ptr<base::Value> ItemCheckedNetLogCallback(
     DownloadDangerType danger_type,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("danger_type", download_danger_names[danger_type]);
 
-  return dict.Pass();
+  return std::move(dict);
 }
 
 scoped_ptr<base::Value> ItemRenamedNetLogCallback(
     const base::FilePath* old_filename,
     const base::FilePath* new_filename,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("old_filename", old_filename->AsUTF8Unsafe());
   dict->SetString("new_filename", new_filename->AsUTF8Unsafe());
 
-  return dict.Pass();
+  return std::move(dict);
 }
 
 scoped_ptr<base::Value> ItemInterruptedNetLogCallback(
     DownloadInterruptReason reason,
     int64_t bytes_so_far,
     const std::string* hash_state,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("interrupt_reason", DownloadInterruptReasonToString(reason));
   dict->SetString("bytes_so_far", base::Int64ToString(bytes_so_far));
   dict->SetString("hash_state",
                   base::HexEncode(hash_state->data(), hash_state->size()));
 
-  return dict.Pass();
+  return std::move(dict);
 }
 
 scoped_ptr<base::Value> ItemResumingNetLogCallback(
     bool user_initiated,
     DownloadInterruptReason reason,
     int64_t bytes_so_far,
     const std::string* hash_state,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("user_initiated", user_initiated ? "true" : "false");
   dict->SetString("interrupt_reason", DownloadInterruptReasonToString(reason));
   dict->SetString("bytes_so_far", base::Int64ToString(bytes_so_far));
   dict->SetString("hash_state",
                   base::HexEncode(hash_state->data(), hash_state->size()));
 
-  return dict.Pass();
+  return std::move(dict);
 }
 
 scoped_ptr<base::Value> ItemCompletingNetLogCallback(
     int64_t bytes_so_far,
     const std::string* final_hash,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("bytes_so_far", base::Int64ToString(bytes_so_far));
   dict->SetString("final_hash",
                   base::HexEncode(final_hash->data(), final_hash->size()));
 
-  return dict.Pass();
+  return std::move(dict);
 }
 
 scoped_ptr<base::Value> ItemFinishedNetLogCallback(
     bool auto_opened,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("auto_opened", auto_opened ? "yes" : "no");
 
-  return dict.Pass();
+  return std::move(dict);
 }
 
 scoped_ptr<base::Value> ItemCanceledNetLogCallback(
     int64_t bytes_so_far,
     const std::string* hash_state,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("bytes_so_far", base::Int64ToString(bytes_so_far));
   dict->SetString("hash_state",
                   base::HexEncode(hash_state->data(), hash_state->size()));
 
-  return dict.Pass();
+  return std::move(dict);
 }
 
 scoped_ptr<base::Value> FileOpenedNetLogCallback(
     const base::FilePath* file_name,
     int64_t start_offset,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("file_name", file_name->AsUTF8Unsafe());
   dict->SetString("start_offset", base::Int64ToString(start_offset));
 
-  return dict.Pass();
+  return std::move(dict);
 }
 
 scoped_ptr<base::Value> FileStreamDrainedNetLogCallback(
     size_t stream_size,
     size_t num_buffers,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetInteger("stream_size", static_cast<int>(stream_size));
   dict->SetInteger("num_buffers", static_cast<int>(num_buffers));
 
-  return dict.Pass();
+  return std::move(dict);
 }
 
 scoped_ptr<base::Value> FileRenamedNetLogCallback(
     const base::FilePath* old_filename,
     const base::FilePath* new_filename,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("old_filename", old_filename->AsUTF8Unsafe());
   dict->SetString("new_filename", new_filename->AsUTF8Unsafe());
 
-  return dict.Pass();
+  return std::move(dict);
 }
 
 scoped_ptr<base::Value> FileErrorNetLogCallback(
     const char* operation,
     net::Error net_error,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("operation", operation);
   dict->SetInteger("net_error", net_error);
 
-  return dict.Pass();
+  return std::move(dict);
 }
 
 scoped_ptr<base::Value> FileInterruptedNetLogCallback(
     const char* operation,
     int os_error,
     DownloadInterruptReason reason,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("operation", operation);
   if (os_error != 0)
     dict->SetInteger("os_error", os_error);
   dict->SetString("interrupt_reason", DownloadInterruptReasonToString(reason));
 
-  return dict.Pass();
+  return std::move(dict);
 }
 
 }  // namespace content