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

chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc

 // Copyright 2015 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 "chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 47 matching lines @@
       sink_val->SetString("description", sink.description());
 
     int cast_mode_bits = 0;
     for (MediaCastMode cast_mode : sink_with_cast_modes.cast_modes)
       cast_mode_bits |= cast_mode;
 
     sink_val->SetInteger("castModes", cast_mode_bits);
     value->Append(sink_val.release());
   }
 
-  return value.Pass();
+  return value;
 }
 
 scoped_ptr<base::DictionaryValue> RouteToValue(
     const MediaRoute& route, const std::string& extension_id) {
   scoped_ptr<base::DictionaryValue> dictionary(new base::DictionaryValue);
   dictionary->SetString("id", route.media_route_id());
   dictionary->SetString("sinkId", route.media_sink_id());
   dictionary->SetString("description", route.description());
   dictionary->SetBoolean("isLocal", route.is_local());
 
   const std::string& custom_path = route.custom_controller_path();
   if (!custom_path.empty()) {
     std::string full_custom_controller_path = base::StringPrintf("%s://%s/%s",
         extensions::kExtensionScheme, extension_id.c_str(),
             custom_path.c_str());
     DCHECK(GURL(full_custom_controller_path).is_valid());
     dictionary->SetString("customControllerPath",
                           full_custom_controller_path);
   }
 
-  return dictionary.Pass();
+  return dictionary;
 }
 
 scoped_ptr<base::ListValue> RoutesToValue(
     const std::vector<MediaRoute>& routes, const std::string& extension_id) {
   scoped_ptr<base::ListValue> value(new base::ListValue);
 
   for (const MediaRoute& route : routes) {
     scoped_ptr<base::DictionaryValue> route_val(RouteToValue(route,
         extension_id));
     value->Append(route_val.release());
   }
 
-  return value.Pass();
+  return value;
 }
 
 scoped_ptr<base::ListValue> CastModesToValue(const CastModeSet& cast_modes,
                                              const std::string& source_host) {
   scoped_ptr<base::ListValue> value(new base::ListValue);
 
   for (const MediaCastMode& cast_mode : cast_modes) {
     scoped_ptr<base::DictionaryValue> cast_mode_val(new base::DictionaryValue);
     cast_mode_val->SetInteger("type", cast_mode);
     cast_mode_val->SetString(
         "description", MediaCastModeToDescription(cast_mode, source_host));
     cast_mode_val->SetString("host", source_host);
     value->Append(cast_mode_val.release());
   }
 
-  return value.Pass();
+  return value;
 }
 
 // Returns an Issue dictionary created from |issue| that can be used in WebUI.
 scoped_ptr<base::DictionaryValue> IssueToValue(const Issue& issue) {
   scoped_ptr<base::DictionaryValue> dictionary(new base::DictionaryValue);
   dictionary->SetString("id", issue.id());
   dictionary->SetString("title", issue.title());
   dictionary->SetString("message", issue.message());
   dictionary->SetInteger("defaultActionType", issue.default_action().type());
   if (!issue.secondary_actions().empty()) {
     dictionary->SetInteger("secondaryActionType",
                            issue.secondary_actions().begin()->type());
   }
   if (!issue.route_id().empty())
     dictionary->SetString("routeId", issue.route_id());
   dictionary->SetBoolean("isBlocking", issue.is_blocking());
 
-  return dictionary.Pass();
+  return dictionary;
 }
 
 bool IsValidIssueActionTypeNum(int issue_action_type_num) {
   return issue_action_type_num >= 0 &&
          issue_action_type_num < IssueAction::TYPE_MAX;
 }
 
 // Composes a "learn more" URL. The URL depends on template arguments in |args|.
 // Returns an empty string if |args| is invalid.
 std::string GetLearnMoreUrl(const base::DictionaryValue* args) {
@@ skipping 263 matching lines @@
     open_args->AppendString(learn_more_url);
     web_ui()->CallJavascriptFunction(kWindowOpen, *open_args);
     return true;
   } else {
     // Do nothing; no other issue action types require any other action.
     return true;
   }
 }
 
 }  // namespace media_router