Moves some files into mojo/common

mojo/mojo.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
       'target_name': 'mojo',
       'type': 'none',
       'dependencies': [
+        'mojo_common_lib',
+        'mojo_common_unittests',
         'mojo_public_test_support',
         'mojo_public_unittests',
         'mojo_public_perftests',
         'mojo_system',
         'mojo_system_unittests',
         'mojo_shell_lib',
         'mojo_shell',
-        'mojo_shell_unittests',
         'mojo_utility',
         'sample_app',
         'mojo_bindings',
         'mojo_bindings_test',
         'native_viewport',
       ],
     },
     {
       'target_name': 'mojo_public_test_support',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         'mojo_system',
       ],
       'sources': [
         'public/tests/simple_bindings_support.cc',
         'public/tests/simple_bindings_support.h',
         'public/tests/test_support.cc',
         'public/tests/test_support.h',
       ],
     },
     {
+      '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': [
         '../base/base.gyp:run_all_unittests',
         '../testing/gtest.gyp:gtest',
         'mojo_bindings',
         'mojo_public_test_support',
         'mojo_system',
       ],
       'sources': [
@@ skipping 99 matching lines @@
         '../url/url.gyp:url_lib',
         'mojo_system',
         'mojo_utility',
         'native_viewport',
       ],
       'sources': [
         'shell/app_container.cc',
         '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',
         'shell/switches.h',
         'shell/task_runners.cc',
         'shell/task_runners.h',
         'shell/url_request_context_getter.cc',
         'shell/url_request_context_getter.h',
       ],
       'conditions': [
@@ skipping 21 matching lines @@
       'conditions': [
         ['OS == "win"', {
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [
             4267,
           ],
         }],
       ],
     },
     {
-      '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': [
         'mojo_system'
       ],
       'sources': [
         'public/utility/scoped_handle.cc',
         'public/utility/scoped_handle.h',
       ],
     },
@@ skipping 162 matching lines @@
             'java_in_dir': '<(DEPTH)/mojo/shell/android/apk',
             'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res',
             'native_lib_target': 'libmojo_shell',
           },
           'includes': [ '../build/java_apk.gypi' ],
         }
       ],
     }],
   ],
 }