Sync to r462023, except mojo/ and ipc_sync_message.h.

It turned out that several files are out-dated or too new.
Sync those files to r462023.

Bug: 73606903
Test: Built locally.
Change-Id: I51596b501df8cfaa23fd8b85a9bd4962b6c44cd3

5 files changed, 31 insertions, 73 deletions

diff --git a/ipc/ipc_message_start.h b/ipc/ipc_message_start.h
index 3c41f04..1368635 100644
--- a/ipc/ipc_message_start.h
+++ b/ipc/ipc_message_start.h
@@ -81,7 +81,6 @@ enum IPCMessageStart {
   EmbeddedWorkerContextMsgStart,
   CastMsgStart,
   CdmMsgStart,
-  ScreenOrientationMsgStart,
   MediaStreamTrackMetricsHostMsgStart,
   ChromeExtensionMsgStart,
   PushMessagingMsgStart,
@@ -93,7 +92,6 @@ enum IPCMessageStart {
   PlatformNotificationMsgStart,
   PDFMsgStart,
   ManifestManagerMsgStart,
-  ExtensionUtilityMsgStart,
   LayoutTestMsgStart,
   NetworkHintsMsgStart,
   BluetoothMsgStart,
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index 40dd670..2d51c98 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -21,7 +21,6 @@
 #include "base/containers/stack_container.h"
 #include "base/files/file.h"
 #include "base/format_macros.h"
-#include "base/memory/scoped_vector.h"
 #include "base/optional.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
@@ -856,39 +855,6 @@ struct ParamTraits<std::tuple<A, B, C, D, E>> {
   }
 };
 
-template<class P>
-struct ParamTraits<ScopedVector<P> > {
-  typedef ScopedVector<P> param_type;
-  static void Write(base::Pickle* m, const param_type& p) {
-    WriteParam(m, static_cast<int>(p.size()));
-    for (size_t i = 0; i < p.size(); i++)
-      WriteParam(m, *p[i]);
-  }
-  static bool Read(const base::Pickle* m,
-                   base::PickleIterator* iter,
-                   param_type* r) {
-    int size = 0;
-    if (!iter->ReadLength(&size))
-      return false;
-    if (INT_MAX/sizeof(P) <= static_cast<size_t>(size))
-      return false;
-    r->resize(size);
-    for (int i = 0; i < size; i++) {
-      (*r)[i] = new P();
-      if (!ReadParam(m, iter, (*r)[i]))
-        return false;
-    }
-    return true;
-  }
-  static void Log(const param_type& p, std::string* l) {
-    for (size_t i = 0; i < p.size(); ++i) {
-      if (i != 0)
-        l->append(" ");
-      LogParam(*p[i], l);
-    }
-  }
-};
-
 template <class P, size_t stack_capacity>
 struct ParamTraits<base::StackVector<P, stack_capacity> > {
   typedef base::StackVector<P, stack_capacity> param_type;
diff --git a/ui/gfx/geometry/mojo/BUILD.gn b/ui/gfx/geometry/mojo/BUILD.gn
index 1fcd39f..f6cda9d 100644
--- a/ui/gfx/geometry/mojo/BUILD.gn
+++ b/ui/gfx/geometry/mojo/BUILD.gn
@@ -10,9 +10,6 @@ mojom("mojo") {
   sources = [
     "geometry.mojom",
   ]
-
-  # TODO(crbug.com/699569): Convert to use the new JS bindings.
-  use_new_js_bindings = false
 }
 
 mojom("test_interfaces") {
diff --git a/ui/gfx/geometry/mojo/geometry_struct_traits_unittest.cc b/ui/gfx/geometry/mojo/geometry_struct_traits_unittest.cc
index 2be935b..d595794 100644
--- a/ui/gfx/geometry/mojo/geometry_struct_traits_unittest.cc
+++ b/ui/gfx/geometry/mojo/geometry_struct_traits_unittest.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <utility>
-
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -21,52 +19,54 @@ class GeometryStructTraitsTest : public testing::Test,
 
  protected:
   mojom::GeometryTraitsTestServicePtr GetTraitsTestProxy() {
-    mojom::GeometryTraitsTestServicePtr proxy;
-    traits_test_bindings_.AddBinding(this, mojo::MakeRequest(&proxy));
-    return proxy;
+    return traits_test_bindings_.CreateInterfacePtrAndBind(this);
   }
 
  private:
   // GeometryTraitsTestService:
-  void EchoPoint(const Point& p, EchoPointCallback callback) override {
-    std::move(callback).Run(p);
+  void EchoPoint(const Point& p, const EchoPointCallback& callback) override {
+    callback.Run(p);
   }
 
-  void EchoPointF(const PointF& p, EchoPointFCallback callback) override {
-    std::move(callback).Run(p);
+  void EchoPointF(const PointF& p,
+                  const EchoPointFCallback& callback) override {
+    callback.Run(p);
   }
 
-  void EchoSize(const Size& s, EchoSizeCallback callback) override {
-    std::move(callback).Run(s);
+  void EchoSize(const Size& s, const EchoSizeCallback& callback) override {
+    callback.Run(s);
   }
 
-  void EchoSizeF(const SizeF& s, EchoSizeFCallback callback) override {
-    std::move(callback).Run(s);
+  void EchoSizeF(const SizeF& s, const EchoSizeFCallback& callback) override {
+    callback.Run(s);
   }
 
-  void EchoRect(const Rect& r, EchoRectCallback callback) override {
-    std::move(callback).Run(r);
+  void EchoRect(const Rect& r, const EchoRectCallback& callback) override {
+    callback.Run(r);
   }
 
-  void EchoRectF(const RectF& r, EchoRectFCallback callback) override {
-    std::move(callback).Run(r);
+  void EchoRectF(const RectF& r, const EchoRectFCallback& callback) override {
+    callback.Run(r);
   }
 
-  void EchoInsets(const Insets& i, EchoInsetsCallback callback) override {
-    std::move(callback).Run(i);
+  void EchoInsets(const Insets& i,
+                  const EchoInsetsCallback& callback) override {
+    callback.Run(i);
   }
 
-  void EchoInsetsF(const InsetsF& i, EchoInsetsFCallback callback) override {
-    std::move(callback).Run(i);
+  void EchoInsetsF(const InsetsF& i,
+                   const EchoInsetsFCallback& callback) override {
+    callback.Run(i);
   }
 
-  void EchoVector2d(const Vector2d& v, EchoVector2dCallback callback) override {
-    std::move(callback).Run(v);
+  void EchoVector2d(const Vector2d& v,
+                    const EchoVector2dCallback& callback) override {
+    callback.Run(v);
   }
 
   void EchoVector2dF(const Vector2dF& v,
-                     EchoVector2dFCallback callback) override {
-    std::move(callback).Run(v);
+                     const EchoVector2dFCallback& callback) override {
+    callback.Run(v);
   }
 
   base::MessageLoop loop_;
diff --git a/ui/gfx/range/mojo/range_struct_traits_unittest.cc b/ui/gfx/range/mojo/range_struct_traits_unittest.cc
index 31705ca..70b32f3 100644
--- a/ui/gfx/range/mojo/range_struct_traits_unittest.cc
+++ b/ui/gfx/range/mojo/range_struct_traits_unittest.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <utility>
-
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -20,19 +18,18 @@ class RangeStructTraitsTest : public testing::Test,
 
  protected:
   mojom::RangeTraitsTestServicePtr GetTraitsTestProxy() {
-    mojom::RangeTraitsTestServicePtr proxy;
-    traits_test_bindings_.AddBinding(this, mojo::MakeRequest(&proxy));
-    return proxy;
+    return traits_test_bindings_.CreateInterfacePtrAndBind(this);
   }
 
  private:
   // RangeTraitsTestService:
-  void EchoRange(const Range& p, EchoRangeCallback callback) override {
-    std::move(callback).Run(p);
+  void EchoRange(const Range& p, const EchoRangeCallback& callback) override {
+    callback.Run(p);
   }
 
-  void EchoRangeF(const RangeF& p, EchoRangeFCallback callback) override {
-    std::move(callback).Run(p);
+  void EchoRangeF(const RangeF& p,
+                  const EchoRangeFCallback& callback) override {
+    callback.Run(p);
   }
 
   base::MessageLoop loop_;