Preliminary fixes to enable link dependent objects.

BUG=22926
TEST=still builds
Review URL: http://codereview.chromium.org/231020

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

6 files changed, 14 insertions, 9 deletions

diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index 3a3a1db..ac89050 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -79,8 +79,6 @@
             'util/work_item.h',
             'util/work_item_list.cc',
             'util/work_item_list.h',
-            '../common/json_value_serializer.cc',
-            '../common/pref_names.cc',
           ],
           'variables': {
             'extra_installer_util_sources%': 0,
diff --git a/net/base/sdch_filter_unittest.cc b/net/base/sdch_filter_unittest.cc
index 6e9904d..99a3ffd 100644
--- a/net/base/sdch_filter_unittest.cc
+++ b/net/base/sdch_filter_unittest.cc
@@ -20,7 +20,7 @@
 #include "net/base/filter_unittest.h"
 #include "net/base/io_buffer.h"
 #include "net/base/sdch_filter.h"
-#include "net/url_request/url_request_http_job.cc"
+#include "net/url_request/url_request_http_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 //------------------------------------------------------------------------------
diff --git a/sandbox/src/interception_unittest.cc b/sandbox/src/interception_unittest.cc
index 6d63954..92e72c1 100644
--- a/sandbox/src/interception_unittest.cc
+++ b/sandbox/src/interception_unittest.cc
@@ -6,8 +6,12 @@
 // The tests require private information so the whole interception.cc file is
 // included from this file.
 
+#include <windows.h>
+
 #include "base/scoped_ptr.h"
-#include "sandbox/src/interception.cc"
+#include "sandbox/src/interception.h"
+#include "sandbox/src/interception_internal.h"
+#include "sandbox/src/target_process.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp
index 6649956..ee06a98 100644
--- a/third_party/tcmalloc/tcmalloc.gyp
+++ b/third_party/tcmalloc/tcmalloc.gyp
@@ -208,8 +208,6 @@
             'tcmalloc/src/profile-handler.cc',
             'tcmalloc/src/profile-handler.h',
             'tcmalloc/src/profiler.cc',
-            'tcmalloc/src/raw_printer.cc',
-            'tcmalloc/src/raw_printer.h',
 
             # don't use linux forked versions
             'malloc_hook.cc',
diff --git a/webkit/extensions/v8/gears_extension.cc b/webkit/extensions/v8/gears_extension.cc
index 92405ed..5bcd6cd 100644
--- a/webkit/extensions/v8/gears_extension.cc
+++ b/webkit/extensions/v8/gears_extension.cc
@@ -7,11 +7,11 @@
 
 namespace extensions_v8 {
 
-const char* kGearsExtensionName = "v8/Gears";
+const char* const kGearsExtensionName = "v8/Gears";
 
 // Note: when a page touches the "google.gears.factory" object, this script
 // touches the DOM.  We expect the DOM to be available at that time.
-const char* kGearsExtensionScript =
+const char* const kGearsExtensionScript =
     "var google;"
     "if (!google)"
     "  google = {};"
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 56cc143..a7e47a1 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -484,7 +484,7 @@
             # AdditionalDependencies, which tries to do the copy before
             # the file is built...
             #
-            #}, { # OS == "win"
+            }, { # OS == "win"
             #  # The old VS build would explicitly copy the .dll into the
             #  # plugins subdirectory like this.  It might be possible to
             #  # use the 'product_dir' setting to build directly into
@@ -496,6 +496,11 @@
             #      'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'],
             #    },
             #  ],
+              'link_settings': {
+                'libraries': [
+                  "winmm.lib",
+                 ],
+              },
             }],
             ['OS=="mac"', {
               'product_name': 'TestNetscapePlugIn',