Moves some files into mojo/common

mojo/mojo.gyp

Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index dbe1a61d9e63a3f60bb8d168f9bcf9ef78812604..3ffdf7418a738985d4bea78b50b9e1d0cbce7dfe 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -11,6 +11,8 @@
       'target_name': 'mojo',
       'type': 'none',
       'dependencies': [
+        'mojo_common_lib',
+        'mojo_common_unittests',
         'mojo_public_test_support',
         'mojo_public_unittests',
         'mojo_public_perftests',
@@ -18,7 +20,6 @@
         'mojo_system_unittests',
         'mojo_shell_lib',
         'mojo_shell',
-        'mojo_shell_unittests',
         'mojo_utility',
         'sample_app',
         'mojo_bindings',
@@ -42,6 +43,55 @@
       ],
     },
     {
+      'target_name': 'mojo_common_lib',
+      'type': '<(component)',
+      'defines': [
+        'MOJO_COMMON_IMPLEMENTATION',
+      ],
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',

[sky, 2013/11/07 18:32:00]

Not sure why I had to add this, but without it I get link errors when building
mojo_common_unittests and AnnotateHappensAfter.

+        'mojo_system',
+      ],
+      'sources': [
+        'common/handle_watcher.cc',
+        'common/handle_watcher.h',
+        'common/scoped_message_pipe.cc',
+        'common/scoped_message_pipe.h',
+      ],
+      'conditions': [
+        ['OS == "win"', {
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [
+            4267,
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'mojo_common_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../base/base.gyp:run_all_unittests',
+        '../testing/gtest.gyp:gtest',
+        'mojo_common_lib',
+        'mojo_system',
+      ],
+      'sources': [
+        'common/handle_watcher_unittest.cc',
+        'common/test/run_all_unittests.cc',
+      ],
+      'conditions': [
+        ['OS == "win"', {
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [
+            4267,
+          ],
+        }],
+      ],
+    },
+    {
       'target_name': 'mojo_public_unittests',
       'type': 'executable',
       'dependencies': [
@@ -161,16 +211,12 @@
         'shell/app_container.h',
         'shell/context.cc',
         'shell/context.h',
-        'shell/handle_watcher.cc',
-        'shell/handle_watcher.h',
         'shell/loader.cc',
         'shell/loader.h',
         'shell/network_delegate.cc',
         'shell/network_delegate.h',
         'shell/run.cc',
         'shell/run.h',
-        'shell/scoped_message_pipe.cc',
-        'shell/scoped_message_pipe.h',
         'shell/storage.cc',
         'shell/storage.h',
         'shell/switches.cc',
@@ -212,29 +258,6 @@
       ],
     },
     {
-      'target_name': 'mojo_shell_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:run_all_unittests',
-        '../testing/gtest.gyp:gtest',
-        'mojo_shell_lib',
-        'mojo_system',
-      ],
-      'sources': [
-        'shell/handle_watcher_unittest.cc',
-        'shell/test/run_all_unittests.cc',
-      ],
-      'conditions': [
-        ['OS == "win"', {
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [
-            4267,
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'mojo_utility',
       'type': 'static_library',
       'dependencies': [