Reduce the number of unneeded dependencies.

Split constants in common off so the projects that wants to pull that don't need to pull half-the-world.

TEST=still compiles
BUG=22926
Review URL: http://codereview.chromium.org/241006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27296 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 38 insertions, 29 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 89a5efd..d5fe44f 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -393,11 +393,37 @@
         }],
       ],
     },
+     {
+      'target_name': 'common_constants',
+      'type': '<(library)',
+      'dependencies': [
+        '../base/base.gyp:base',
+      ],
+      'sources': [
+        'common/chrome_constants.cc',
+        'common/chrome_constants.h',
+        'common/chrome_paths.cc',
+        'common/chrome_paths.h',
+        'common/chrome_paths_internal.h',
+        'common/chrome_paths_linux.cc',
+        'common/chrome_paths_mac.mm',
+        'common/chrome_paths_win.cc',
+        'common/chrome_switches.cc',
+        'common/chrome_switches.h',
+        'common/env_vars.cc',
+        'common/env_vars.h',
+        'common/json_value_serializer.cc',
+        'common/json_value_serializer.h',
+        'common/pref_names.cc',
+        'common/pref_names.h',
+      ],
+    },
     {
       'target_name': 'common',
       'type': '<(library)',
       'msvs_guid': '899F1280-3441-4D1F-BA04-CCD6208D9146',
       'dependencies': [
+        'common_constants',
         'chrome_resources',
         'chrome_strings',
         'theme_resources',
@@ -471,24 +497,14 @@
         'common/child_process_logging_win.cc',
         'common/child_thread.cc',
         'common/child_thread.h',
-        'common/chrome_constants.cc',
-        'common/chrome_constants.h',
         'common/chrome_counters.cc',
         'common/chrome_counters.h',
         'common/chrome_descriptors.h',
-        'common/chrome_paths.cc',
-        'common/chrome_paths.h',
-        'common/chrome_paths_internal.h',
-        'common/chrome_paths_linux.cc',
-        'common/chrome_paths_mac.mm',
-        'common/chrome_paths_win.cc',
         'common/chrome_plugin_api.h',
         'common/chrome_plugin_lib.cc',
         'common/chrome_plugin_lib.h',
         'common/chrome_plugin_util.cc',
         'common/chrome_plugin_util.h',
-        'common/chrome_switches.cc',
-        'common/chrome_switches.h',
         'common/classfactory.cc',
         'common/classfactory.h',
         'common/common_glue.cc',
@@ -502,8 +518,6 @@
         'common/devtools_messages.h',
         'common/devtools_messages_internal.h',
         'common/dom_storage_type.h',
-        'common/env_vars.cc',
-        'common/env_vars.h',
         'common/filter_policy.h',
         'common/gears_api.h',
         'common/gtk_tree.cc',
@@ -514,8 +528,6 @@
         'common/histogram_synchronizer.h',
         'common/important_file_writer.cc',
         'common/important_file_writer.h',
-        'common/json_value_serializer.cc',
-        'common/json_value_serializer.h',
         'common/jstemplate_builder.cc',
         'common/jstemplate_builder.h',
         'common/libxml_utils.cc',
@@ -558,8 +570,6 @@
         'common/plugin_messages_internal.h',
         'common/pref_member.cc',
         'common/pref_member.h',
-        'common/pref_names.cc',
-        'common/pref_names.h',
         'common/pref_service.cc',
         'common/pref_service.h',
         'common/process_watcher_posix.cc',
@@ -3480,14 +3490,11 @@
         }],
         ['OS=="win"', {
           'dependencies': [
-            '../app/app.gyp:app_id',
             'installer/installer.gyp:installer_util',
             'installer/installer.gyp:installer_util_strings',
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../breakpad/breakpad.gyp:breakpad_sender',
             '../sandbox/sandbox.gyp:sandbox',
-            '../views/views.gyp:views',
-            'worker',
             'app/locales/locales.gyp:*',
           ],
           'sources': [
@@ -3722,8 +3729,6 @@
         'test/chrome_process_util_linux.cc',
         'test/chrome_process_util_mac.cc',
         'test/chrome_process_util_win.cc',
-        'test/in_process_browser_test.cc',
-        'test/in_process_browser_test.h',
         'test/perf/mem_usage_linux.cc',
         'test/perf/mem_usage_mac.cc',
         'test/perf/mem_usage_win.cc',
@@ -5357,6 +5362,8 @@
             'browser/blocked_popup_container_interactive_uitest.cc',
             'browser/views/find_bar_host_interactive_uitest.cc',
             'browser/views/tabs/tab_dragging_test.cc',
+            'test/in_process_browser_test.cc',
+            'test/in_process_browser_test.h',
             'test/interactive_ui/npapi_interactive_test.cc',
             'test/interactive_ui/view_event_test_base.cc',
             'test/interactive_ui/view_event_test_base.h',
@@ -5540,6 +5547,8 @@
           ],
           'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
           'sources': [
+            'test/in_process_browser_test.cc',
+            'test/in_process_browser_test.h',
             'test/test_launcher/out_of_proc_test_runner.cc',
             'test/test_launcher/test_runner.cc',
             'test/test_launcher/test_runner.h',
@@ -5747,28 +5756,30 @@
             # TODO(phajdan.jr): Only temporary, to make transition easier.
             'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
             'sources': [
+              'app/chrome_dll.rc',
+              'app/chrome_dll_resource.h',
+              'app/chrome_dll_version.rc.version',
+              'test/in_process_browser_test.cc',
+              'test/in_process_browser_test.h',
               'test/live_sync/bookmark_model_verifier.cc',
               'test/live_sync/bookmark_model_verifier.h',
               'test/live_sync/live_bookmarks_sync_test.cc',
               'test/live_sync/live_bookmarks_sync_test.h',
               'test/live_sync/profile_sync_service_test_harness.cc',
               'test/live_sync/profile_sync_service_test_harness.h',
+              'test/live_sync/single_client_live_bookmarks_sync_unittest.cc',
+              'test/live_sync/two_client_live_bookmarks_sync_test.cc',
               'test/test_launcher/run_all_unittests.cc',
               'test/test_notification_tracker.cc',
               'test/test_notification_tracker.h',
               'test/testing_browser_process.h',
               'test/ui_test_utils.cc',
               'test/ui_test_utils.h',
-              'app/chrome_dll.rc',
-              'app/chrome_dll_resource.h',
-              'app/chrome_dll_version.rc.version',
               'test/data/resource.h',
               'test/data/resource.rc',
               '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
               '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
               '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
-              'test/live_sync/single_client_live_bookmarks_sync_unittest.cc',
-              'test/live_sync/two_client_live_bookmarks_sync_test.cc',
             ],
             'conditions': [
               # Plugin code.
diff --git a/chrome/common/json_value_serializer.cc b/chrome/common/json_value_serializer.cc
index 4a4cc45..33f94ce 100644
--- a/chrome/common/json_value_serializer.cc
+++ b/chrome/common/json_value_serializer.cc
@@ -8,7 +8,6 @@
 #include "base/json_reader.h"
 #include "base/json_writer.h"
 #include "base/string_util.h"
-#include "chrome/common/logging_chrome.h"
 
 JSONStringValueSerializer::~JSONStringValueSerializer() {}
 
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index ac89050..c9820ab 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -15,7 +15,7 @@
           'dependencies': [
             '../../app/app.gyp:app_id',
             'installer_util_strings',
-            '../chrome.gyp:common',
+            '../chrome.gyp:common_constants',
             '../chrome.gyp:chrome_resources',
             '../chrome.gyp:chrome_strings',
             '../../courgette/courgette.gyp:courgette_lib',
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index e48ed62..71aecaa 100755
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -19,7 +19,6 @@
             '../chrome.gyp:chrome',
             '../chrome.gyp:chrome_dll',
             '../chrome.gyp:default_extensions',
-            '../../testing/gtest.gyp:gtest',
             'installer.gyp:setup',
           ],
           'include_dirs': [