Update monet.

mojo/common/BUILD.gn

Index: mojo/common/BUILD.gn
diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn
index 8b8f083caed70dd27dd8ea63c0558df92578ed35..085be39cc3bea2f2d78470c965840d94c1fa0faa 100644
--- a/mojo/common/BUILD.gn
+++ b/mojo/common/BUILD.gn
@@ -2,65 +2,73 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
-group("common") {
+source_set("common") {
+  sources = [
+    "binding_set.h",
+    "interface_ptr_set.h",
+    "strong_binding_set.h",
+  ]
+
   deps = [
-    ":common_base",
-    ":url_type_converters",
+    "//base",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
   ]
 }
 
-# GYP version: mojo/mojo_base.gyp:mojo_common_lib
-component("common_base") {
-  output_name = "mojo_common_lib"
+source_set("tests") {
+  testonly = true
 
   sources = [
-    "common_type_converters.cc",
-    "common_type_converters.h",
-    "data_pipe_file_utils.cc",
-    "data_pipe_utils.cc",
-    "data_pipe_utils.h",
-    "handle_watcher.cc",
-    "handle_watcher.h",
-    "message_pump_mojo.cc",
-    "message_pump_mojo.h",
-    "message_pump_mojo_handler.h",
-    "time_helper.cc",
-    "time_helper.h",
-    "trace_controller_impl.cc",
-    "trace_controller_impl.h",
-    "tracing_impl.cc",
-    "tracing_impl.h",
-    "user_agent.cc",
-    "user_agent.h",
-    "weak_binding_set.h",
-    "weak_interface_ptr_set.h",
+    "binding_set_unittest.cc",
+    "callback_binding_unittest.cc",
+    "interface_ptr_set_unittest.cc",
+    "strong_binding_set_unittest.cc",
   ]
 
-  defines = [ "MOJO_COMMON_IMPLEMENTATION" ]
-
   deps = [
+    ":common",
+    ":test_interfaces",
     "//base",
-    "//base/third_party/dynamic_annotations",
-    "//third_party/mojo/src/mojo/public/c/system:for_component",
-    "//third_party/mojo/src/mojo/services/tracing/public/interfaces",
+    "//mojo/message_pump",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
+    "//third_party/mojo/src/mojo/public/cpp/system",
+    "//testing/gtest",
   ]
 }
 
-# GYP version: mojo/mojo_base.gyp:mojo_url_type_converters
-source_set("url_type_converters") {
+#test("mojo_common_unittests") {
+#  deps = [
+#    ":tests",
+#    "//mojo/data_pipe_utils:tests",
+#    "//mojo/edk/test:run_all_unittests",
+#    "//mojo/environment:chromium",
+#    "//mojo/message_pump:tests",
+#  ]
+#}
+
+mojom("test_interfaces") {
+  testonly = true
   sources = [
-    "url_type_converters.cc",
-    "url_type_converters.h",
+    "test_interfaces.mojom",
   ]
+}
 
-  include_dirs = [ "//third_party/mojo/src/" ]
+source_set("tracing_impl") {
+  sources = [
+    "trace_provider_impl.cc",
+    "trace_provider_impl.h",
+    "tracing_impl.cc",
+    "tracing_impl.h",
+  ]
 
   deps = [
-    ":common_base",
     "//base",
-    "//base/third_party/dynamic_annotations",
-    "//url",
+    "//third_party/mojo/src/mojo/public/cpp/application",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//mojo/services/tracing/interfaces",
   ]
 }