Use rvalue reference instead of ExtensionBuilder::pass()

extensions/common/test_util.cc

 // Copyright 2014 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 "extensions/common/test_util.h"
 
 #include <utility>
 
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/value_builder.h"
 
 namespace extensions {
 namespace test_util {
 
-ExtensionBuilder& BuildExtension(ExtensionBuilder& builder) {
-  return builder
-         .SetManifest(DictionaryBuilder()
-                      .Set("name", "Test extension")
-                      .Set("version", "1.0")
-                      .Set("manifest_version", 2));
+ExtensionBuilder BuildExtension(ExtensionBuilder builder) {
+  return std::move(builder.SetManifest(DictionaryBuilder()

[danakj, 2015/12/17 22:22:02]

nit: it might be easier to read these if you wrote it as

  builder.SetManifest(....);
  return std::move(builder);

[limasdf, 2015/12/18 00:31:58]

Thank you. |builder| is rvalue, just returning without std::move.

builder.SetManifest(....);
return builder;

[danakj, 2015/12/18 00:38:49]

Ah, right return will make it an rvalue :) Thanks!

+                                           .Set("name", "Test extension")
+                                           .Set("version", "1.0")
+                                           .Set("manifest_version", 2)));
 }
 
-ExtensionBuilder& BuildApp(ExtensionBuilder& builder) {
-  return builder.SetManifest(
+ExtensionBuilder BuildApp(ExtensionBuilder builder) {
+  return std::move(builder.SetManifest(
       DictionaryBuilder()
           .Set("name", "Test extension")
           .Set("version", "1.0")
           .Set("manifest_version", 2)
           .Set("app",
                extensions::DictionaryBuilder().Set(
                    "background",
                    extensions::DictionaryBuilder().Set(
                        "scripts", std::move(extensions::ListBuilder().Append(
-                                      "background.js"))))));
+                                      "background.js")))))));
 }
 
 scoped_refptr<Extension> CreateEmptyExtension() {
   return ExtensionBuilder()
       .SetManifest(
            DictionaryBuilder().Set("name", "Test").Set("version", "1.0"))
       .Build();
 }
 
 scoped_refptr<Extension> CreateEmptyExtension(const std::string& id) {
   return ExtensionBuilder()
       .SetManifest(
            DictionaryBuilder().Set("name", "test").Set("version", "0.1"))
       .SetID(id)
       .Build();
 }
 
 }  // namespace test_util
 }  // namespace extensions