From 794d2bd77811b6d6b45048c19c287075cc9930db Mon Sep 17 00:00:00 2001
From: dcheng <dcheng@chromium.org>
Date: Fri, 26 Feb 2016 19:51:32 -0800
Subject: Make extensions::DictionaryBuilder and extensions::ListValue
 unmovable.

There's no reason for these classes to be movable. std::move() is just
being used as a synonym for Build().

In addition:
- Build() is fewer characters than std::move().
- clang-format works better when builder syntax is consistently used,
  which makes it easier for readers to visually match up deeply nested
  builders.
- It's surprising to see std::move() used with what looks like a
  temporary.

BUG=none

Review URL: https://codereview.chromium.org/1739183003

Cr-Commit-Position: refs/heads/master@{#378107}
---
 .../browser/api/identity/identity_api_unittest.cc     | 19 +++++++++++--------
 .../browser/shell_native_app_window_aura_unittest.cc  |  9 +++++----
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'extensions/shell')

diff --git a/extensions/shell/browser/api/identity/identity_api_unittest.cc b/extensions/shell/browser/api/identity/identity_api_unittest.cc
index bf9248c..0af6e4b1 100644
--- a/extensions/shell/browser/api/identity/identity_api_unittest.cc
+++ b/extensions/shell/browser/api/identity/identity_api_unittest.cc
@@ -65,18 +65,21 @@ class IdentityApiTest : public ApiUnitTest {
     // Create an extension with OAuth2 scopes.
     set_extension(
         ExtensionBuilder()
-            .SetManifest(std::move(
+            .SetManifest(
                 DictionaryBuilder()
                     .Set("name", "Test")
                     .Set("version", "1.0")
                     .Set("oauth2",
-                         std::move(DictionaryBuilder()
-                                       .Set("client_id",
-                                            "123456.apps.googleusercontent.com")
-                                       .Set("scopes",
-                                            std::move(ListBuilder().Append(
-                                                "https://www.googleapis.com/"
-                                                "auth/drive")))))))
+                         DictionaryBuilder()
+                             .Set("client_id",
+                                  "123456.apps.googleusercontent.com")
+                             .Set("scopes",
+                                  ListBuilder()
+                                      .Append("https://www.googleapis.com/"
+                                              "auth/drive")
+                                      .Build())
+                             .Build())
+                    .Build())
             .SetLocation(Manifest::UNPACKED)
             .Build());
   }
diff --git a/extensions/shell/browser/shell_native_app_window_aura_unittest.cc b/extensions/shell/browser/shell_native_app_window_aura_unittest.cc
index 728e787..be7df4b 100644
--- a/extensions/shell/browser/shell_native_app_window_aura_unittest.cc
+++ b/extensions/shell/browser/shell_native_app_window_aura_unittest.cc
@@ -44,10 +44,11 @@ TEST_F(ShellNativeAppWindowAuraTest, Bounds) {
       new content::TestBrowserContext);
   scoped_refptr<Extension> extension =
       ExtensionBuilder()
-          .SetManifest(std::move(DictionaryBuilder()
-                                     .Set("name", "test extension")
-                                     .Set("version", "1")
-                                     .Set("manifest_version", 2)))
+          .SetManifest(DictionaryBuilder()
+                           .Set("name", "test extension")
+                           .Set("version", "1")
+                           .Set("manifest_version", 2)
+                           .Build())
           .Build();
 
   AppWindow* app_window = new AppWindow(
-- 
cgit v1.1