Initial cleanups en route to coalescing the get-it-built cut-and-paste from various SConscripts into readable and maintainable shape. To wit:

* Put the near-universal settings of /DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS, /DWIN32_LEAN_AND_MEAN, /wd4503 and /wd4819 in the base construction environment.
* Sort various unsorted source file lists.
* Fix indentation and quoting for consistency in a couple SConscript files that escaped previous dragnets.
* Eliminate two left-over uses of Split() for input file lists.
* Give the devenv invocation to build v8_shell.exe the full path to the relevant .vcproj file.
* Add /nologo to the base LINKFLAGS setting.
* Remove various CPPPATH and other settings that have been hanging around commented out from the Visual Studio build (in case we needed them, which we evidently don't).
* Get rid of unnecessary env.File() and env.Dir() calls in various settings (esp. CPPPATH) and source file lists.
* Add copyright notice to an overlooked SConscript file.
* Clean up version.bat invocation.
TBR: bradnelson

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

12 files changed, 152 insertions, 184 deletions

diff --git a/webkit/SConscript b/webkit/SConscript
index 458f8e0..c7ee1ea 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -155,9 +155,6 @@ env.Append(
       '_WIN32_WINNT=0x0600',

       'WINVER=0x0600',

 

-      'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-      'WIN32_LEAN_AND_MEAN',

-

       'LIBXSLT_STATIC',

       'LIBXML_STATIC',

       'PNG_USER_CONFIG',

diff --git a/webkit/SConscript.javascriptcore_pcre b/webkit/SConscript.javascriptcore_pcre
index b0b9996..d298028 100644
--- a/webkit/SConscript.javascriptcore_pcre
+++ b/webkit/SConscript.javascriptcore_pcre
@@ -47,8 +47,6 @@ env.Prepend(
         '/wd4610',
         '/wd4706',
         '/wd4800',
-        '/wd4503',
-        '/wd4819',
     ],
 )
 
diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index c75cc35..2d66a43 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -32,108 +32,106 @@ Import('env')
 env = env.Clone()
 
 env.Prepend(
-  CCFLAGS = [
-    "/TP",
+    CCFLAGS = [
+        '/TP',
 
-    "/wd4244",
-    "/wd4291",
-    "/wd4345",
-    "/wd4521",
-    "/wd4800",
-    "/wd4503",
-    "/wd4819",
-  ],
+        '/wd4244',
+        '/wd4291',
+        '/wd4345',
+        '/wd4521',
+        '/wd4800',
+    ],
 )
 
 input_files = [
-    "$PORT_DIR/css/RGBColor.cpp",
-    "$PORT_DIR/history/CachedPage.cpp",
-    "$PORT_DIR/history/BackForwardList.cpp",
-    "$PORT_DIR/bridge/PluginsWin.cpp",
-    "$PORT_DIR/bridge/PageWin.cpp",
-    "$PORT_DIR/bridge/HistoryWin.cpp",
-    "$PORT_DIR/bridge/FrameWin.cpp",
-    "$PORT_DIR/rendering/RenderThemeWin.cpp",
-    "$PORT_DIR/platform/network/CookieJarWin.cpp",
-    "$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp",
-    "$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp",
-    "$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp",
-    "$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp",
-    "$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp",
-    "$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp",
-    "$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp",
-    "$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp",
-    "$PORT_DIR/platform/graphics/svg/SVGResourceMaskerSkia.cpp",
-    "$PORT_DIR/platform/graphics/svg/SVGResourceFilterSkia.cpp",
-    "$PORT_DIR/platform/graphics/svg/SVGResourceClipperSkia.cpp",
-    "$PORT_DIR/platform/graphics/svg/SVGPaintServerSolidSkia.cpp",
-    "$PORT_DIR/platform/graphics/svg/SVGPaintServerSkia.cpp",
-    "$PORT_DIR/platform/graphics/svg/SVGPaintServerPatternSkia.cpp",
-    "$PORT_DIR/platform/graphics/svg/SVGPaintServerGradientSkia.cpp",
-    "$PORT_DIR/platform/graphics/svg/SkiaSupport.cpp",
-    "$PORT_DIR/platform/graphics/svg/RenderPathSkia.cpp",
-    "$PORT_DIR/platform/graphics/SkPaintContext.cpp",
-    "$PORT_DIR/platform/graphics/SkiaUtils.cpp",
-    "$PORT_DIR/platform/graphics/SkGraphicsContext.cpp",
-    "$PORT_DIR/platform/graphics/SimpleFontDataWin.cpp",
-    "$PORT_DIR/platform/graphics/PlatformContextSkia.cpp",
-    "$PORT_DIR/platform/graphics/PathSkia.cpp",
-    "$PORT_DIR/platform/graphics/IntSizeWin.cpp",
-    "$PORT_DIR/platform/graphics/IntRectWin.cpp",
-    "$PORT_DIR/platform/graphics/IntPointWin.cpp",
-    "$PORT_DIR/platform/graphics/ImageSourceSkia.cpp",
-    "$PORT_DIR/platform/graphics/ImageSkia.cpp",
-    "$PORT_DIR/platform/graphics/ImageBufferSkia.cpp",
-    "$PORT_DIR/platform/graphics/IconWin.cpp",
-    "$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp",
-    "$PORT_DIR/platform/graphics/GraphicsContextPrivate.cpp",
-    "$PORT_DIR/platform/graphics/GlyphPageTreeNodeWin.cpp",
-    "$PORT_DIR/platform/graphics/FontWin.cpp",
-    "$PORT_DIR/platform/graphics/FontPlatformDataWin.cpp",
-    "$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp",
-    "$PORT_DIR/platform/graphics/FontCacheWin.cpp",
-    "$PORT_DIR/platform/graphics/AffineTransformSkia.cpp",
-    "$PORT_DIR/platform/graphics/NativeImageSkia.cpp",
-    "$PORT_DIR/platform/WidgetWin.cpp",
-    "$PORT_DIR/platform/WheelEventWin.cpp",
-    "$PORT_DIR/platform/WCDataObject.cpp",
-    "$PORT_DIR/platform/UniscribeStateTextRun.cpp",
-    "$PORT_DIR/platform/TextBreakIteratorInternalICUWin.cpp",
-    "$PORT_DIR/platform/TextBoundariesWin.cpp",
-    "$PORT_DIR/platform/TemporaryLinkStubs.cpp",
-    "$PORT_DIR/platform/SystemTimeWin.cpp",
-    "$PORT_DIR/platform/SSLKeyGeneratorWin.cpp",
-    "$PORT_DIR/platform/SoundWin.cpp",
-    "$PORT_DIR/platform/SharedTimerWin.cpp",
-    "$PORT_DIR/platform/SearchPopupMenuWin.cpp",
-    "$PORT_DIR/platform/ScrollViewWin.cpp",
-    "$PORT_DIR/platform/ScreenWin.cpp",
-    "$PORT_DIR/platform/PopupMenuWin.cpp",
-    "$PORT_DIR/platform/PlatformScrollBarWin.cpp",
-    "$PORT_DIR/platform/PlatformMouseEventWin.cpp",
-    "$PORT_DIR/platform/PasteboardWin.cpp",
-    "$PORT_DIR/platform/MimeTypeRegistryWin.cpp",
-    "$PORT_DIR/platform/LogWin.cpp",
-    "$PORT_DIR/platform/Language.cpp",
-    "$PORT_DIR/platform/KeyEventWin.cpp",
-    "$PORT_DIR/platform/GKURL.cpp",
-    "$PORT_DIR/platform/FramelessScrollView.cpp",
-    "$PORT_DIR/platform/FontMetrics.cpp",
-    "$PORT_DIR/platform/FileChooserWin.cpp",
-    "$PORT_DIR/platform/EditorWin.cpp",
-    "$PORT_DIR/platform/DragImageWin.cpp",
-    "$PORT_DIR/platform/DragDataWin.cpp",
-    "$PORT_DIR/platform/CursorWin.cpp",
-    "$PORT_DIR/platform/ContextMenuWin.cpp",
-    "$PORT_DIR/platform/ContextMenuItemWin.cpp",
-    "$PORT_DIR/platform/ClipboardWin.cpp",
-    "$PORT_DIR/platform/ClipboardUtilitiesWin.cpp",
-    "$PORT_DIR/platform/BString.cpp",
-    "$PORT_DIR/loader/IconLoader.cpp",
-    "$PORT_DIR/loader/IconDatabaseNone.cpp",
-    "$PORT_DIR/page/AXObjectCacheWin.cpp",
-    "$PORT_DIR/page/EventHandlerWin.cpp",
-    "$PORT_DIR/page/DragControllerWin.cpp",
+    '$PORT_DIR/css/RGBColor.cpp',
+    '$PORT_DIR/history/CachedPage.cpp',
+    '$PORT_DIR/history/BackForwardList.cpp',
+    '$PORT_DIR/bridge/PluginsWin.cpp',
+    '$PORT_DIR/bridge/PageWin.cpp',
+    '$PORT_DIR/bridge/HistoryWin.cpp',
+    '$PORT_DIR/bridge/FrameWin.cpp',
+    '$PORT_DIR/rendering/RenderThemeWin.cpp',
+    '$PORT_DIR/platform/network/CookieJarWin.cpp',
+    '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp',
+    '$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp',
+    '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp',
+    '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp',
+    '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp',
+    '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp',
+    '$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp',
+    '$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp',
+    '$PORT_DIR/platform/graphics/svg/SVGResourceMaskerSkia.cpp',
+    '$PORT_DIR/platform/graphics/svg/SVGResourceFilterSkia.cpp',
+    '$PORT_DIR/platform/graphics/svg/SVGResourceClipperSkia.cpp',
+    '$PORT_DIR/platform/graphics/svg/SVGPaintServerSolidSkia.cpp',
+    '$PORT_DIR/platform/graphics/svg/SVGPaintServerSkia.cpp',
+    '$PORT_DIR/platform/graphics/svg/SVGPaintServerPatternSkia.cpp',
+    '$PORT_DIR/platform/graphics/svg/SVGPaintServerGradientSkia.cpp',
+    '$PORT_DIR/platform/graphics/svg/SkiaSupport.cpp',
+    '$PORT_DIR/platform/graphics/svg/RenderPathSkia.cpp',
+    '$PORT_DIR/platform/graphics/SkPaintContext.cpp',
+    '$PORT_DIR/platform/graphics/SkiaUtils.cpp',
+    '$PORT_DIR/platform/graphics/SkGraphicsContext.cpp',
+    '$PORT_DIR/platform/graphics/SimpleFontDataWin.cpp',
+    '$PORT_DIR/platform/graphics/PlatformContextSkia.cpp',
+    '$PORT_DIR/platform/graphics/PathSkia.cpp',
+    '$PORT_DIR/platform/graphics/IntSizeWin.cpp',
+    '$PORT_DIR/platform/graphics/IntRectWin.cpp',
+    '$PORT_DIR/platform/graphics/IntPointWin.cpp',
+    '$PORT_DIR/platform/graphics/ImageSourceSkia.cpp',
+    '$PORT_DIR/platform/graphics/ImageSkia.cpp',
+    '$PORT_DIR/platform/graphics/ImageBufferSkia.cpp',
+    '$PORT_DIR/platform/graphics/IconWin.cpp',
+    '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp',
+    '$PORT_DIR/platform/graphics/GraphicsContextPrivate.cpp',
+    '$PORT_DIR/platform/graphics/GlyphPageTreeNodeWin.cpp',
+    '$PORT_DIR/platform/graphics/FontWin.cpp',
+    '$PORT_DIR/platform/graphics/FontPlatformDataWin.cpp',
+    '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp',
+    '$PORT_DIR/platform/graphics/FontCacheWin.cpp',
+    '$PORT_DIR/platform/graphics/AffineTransformSkia.cpp',
+    '$PORT_DIR/platform/graphics/NativeImageSkia.cpp',
+    '$PORT_DIR/platform/WidgetWin.cpp',
+    '$PORT_DIR/platform/WheelEventWin.cpp',
+    '$PORT_DIR/platform/WCDataObject.cpp',
+    '$PORT_DIR/platform/UniscribeStateTextRun.cpp',
+    '$PORT_DIR/platform/TextBreakIteratorInternalICUWin.cpp',
+    '$PORT_DIR/platform/TextBoundariesWin.cpp',
+    '$PORT_DIR/platform/TemporaryLinkStubs.cpp',
+    '$PORT_DIR/platform/SystemTimeWin.cpp',
+    '$PORT_DIR/platform/SSLKeyGeneratorWin.cpp',
+    '$PORT_DIR/platform/SoundWin.cpp',
+    '$PORT_DIR/platform/SharedTimerWin.cpp',
+    '$PORT_DIR/platform/SearchPopupMenuWin.cpp',
+    '$PORT_DIR/platform/ScrollViewWin.cpp',
+    '$PORT_DIR/platform/ScreenWin.cpp',
+    '$PORT_DIR/platform/PopupMenuWin.cpp',
+    '$PORT_DIR/platform/PlatformScrollBarWin.cpp',
+    '$PORT_DIR/platform/PlatformMouseEventWin.cpp',
+    '$PORT_DIR/platform/PasteboardWin.cpp',
+    '$PORT_DIR/platform/MimeTypeRegistryWin.cpp',
+    '$PORT_DIR/platform/LogWin.cpp',
+    '$PORT_DIR/platform/Language.cpp',
+    '$PORT_DIR/platform/KeyEventWin.cpp',
+    '$PORT_DIR/platform/GKURL.cpp',
+    '$PORT_DIR/platform/FramelessScrollView.cpp',
+    '$PORT_DIR/platform/FontMetrics.cpp',
+    '$PORT_DIR/platform/FileChooserWin.cpp',
+    '$PORT_DIR/platform/EditorWin.cpp',
+    '$PORT_DIR/platform/DragImageWin.cpp',
+    '$PORT_DIR/platform/DragDataWin.cpp',
+    '$PORT_DIR/platform/CursorWin.cpp',
+    '$PORT_DIR/platform/ContextMenuWin.cpp',
+    '$PORT_DIR/platform/ContextMenuItemWin.cpp',
+    '$PORT_DIR/platform/ClipboardWin.cpp',
+    '$PORT_DIR/platform/ClipboardUtilitiesWin.cpp',
+    '$PORT_DIR/platform/BString.cpp',
+    '$PORT_DIR/loader/IconLoader.cpp',
+    '$PORT_DIR/loader/IconDatabaseNone.cpp',
+    '$PORT_DIR/page/AXObjectCacheWin.cpp',
+    '$PORT_DIR/page/EventHandlerWin.cpp',
+    '$PORT_DIR/page/DragControllerWin.cpp',
 ]
 
 env.Library("Port.lib", input_files)
diff --git a/webkit/activex_shim/SConscript b/webkit/activex_shim/SConscript
index 5774b4e..5b6b038 100644
--- a/webkit/activex_shim/SConscript
+++ b/webkit/activex_shim/SConscript
@@ -47,9 +47,6 @@ env.Append(
 

         '/WX',

         '/Wp64',

-

-        '/wd4503',

-        '/wd4819',

     ],

 # TODO(bradnelson): Scons should really have a way to handle this.

     ARFLAGS = [

@@ -69,5 +66,3 @@ input_files = [
 ]

 

 env.StaticLibrary('activex_shim', input_files)

-

-

diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index 1680584..003a331 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -144,13 +144,12 @@ env.Append(
         'U_STATIC_IMPLEMENTATION',

         '_WIN32_WINNT=0x0600',

         'WINVER=0x0600',

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

     ],

     CCFLAGS = [

+        '/TP',

+

         '/WX',

         '/Wp64',

-        '/TP',

 

         '/wd4127',

         '/wd4355',

@@ -158,8 +157,6 @@ env.Append(
         '/wd4512',

         '/wd4610',

         '/wd4706',

-        '/wd4503',

-        '/wd4819',

     ],

 )

 

diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index 915d413..62eb813 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -46,8 +46,6 @@ env.Prepend(
         '/wd4521',

         '/wd4244',

         '/wd4800',

-        '/wd4503',

-        '/wd4819',

     ],

 )

 

diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 33ed052..a75ff8e 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -42,8 +42,6 @@ env.Append(
         '/wd4521',

         '/wd4099',

         '/wd4800',

-        '/wd4503',

-        '/wd4819',

     ],

 )

 

diff --git a/webkit/default_plugin/SConscript b/webkit/default_plugin/SConscript
index fc6eca2..0b790e9 100644
--- a/webkit/default_plugin/SConscript
+++ b/webkit/default_plugin/SConscript
@@ -52,9 +52,6 @@ env.Append(
 

         '/WX',

         '/Wp64',

-

-        '/wd4503',

-        '/wd4819',

     ],

 )

 

@@ -69,5 +66,3 @@ input_files = [
 ]

 

 env.StaticLibrary('default_plugin', input_files)

-

-

diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript
index 15f0557..ee3ea9a 100644
--- a/webkit/glue/SConscript
+++ b/webkit/glue/SConscript
@@ -38,69 +38,67 @@ env.Append(
     '/WX',

 

     '/wd4800',

-    '/wd4503',

-    '/wd4819',

   ],

 )

 

 input_files = [

+    '$PENDING_DIR/AccessibleBase.cpp',

+    '$PENDING_DIR/AccessibleDocument.cpp',

     'alt_404_page_resource_fetcher.cc',

+    'alt_error_page_resource_fetcher.cc',

     'autocomplete_input_listener.cc',

-    'plugins/webplugin_delegate_impl.cc',

-    'plugins/plugin_string_stream.cc',

-    'plugins/plugin_stream_url.cc',

-    'plugins/plugin_stream.cc',

-    'plugins/plugin_list.cc',

-    'plugins/plugin_lib.cc',

-    'plugins/plugin_instance.cc',

-    'plugins/plugin_host.cc',

-    'plugins/plugin_data_stream.cc',

-    'plugins/mozilla_extensions.cc',

-    'webwidget_impl.cc',

-    'webview_impl.cc',

-    'weburlrequest_impl.cc',

-    'webtextinput_impl.cc',

-    'webplugin_impl.cc',

-    'webkit_glue.cc',

-    'webinputevent.cc',

-    'webhistoryitem_impl.cc',

-    'webframeloaderclient_impl.cc',

-    'webframe_impl.cc',

-    'weberror_impl.cc',

-    'webdropdata.cc',

-    'webdocumentloader_impl.cc',

-    'webdatasource_impl.cc',

-    'webcursor.cc',

-    'simple_clipboard_impl.cc',

-    'searchable_form_data.cc',

-    'resource_handle_win.cc',

-    'resource_fetcher.cc',

-    'password_form_dom_manager.cc',

-    'password_autocomplete_listener.cc',

-    'multipart_response_delegate.cc',

-    'localized_strings.cc',

-    'inspector_client_impl.cc',

-    'glue_util.cc',

-    'glue_serialize.cc',

-    'feed_preview.cc',

-    'image_resource_fetcher.cc',

-    'image_decoder.cc',

-    'event_conversion.cc',

-    'editor_client_impl.cc',

-    'entity_map.cc',

-    'dragclient_impl.cc',

+    'cache_manager.cc',

+    'chrome_client_impl.cc',

+    'context_menu_client_impl.cc',

+    'cpp_binding_example.cc',

+    'cpp_bound_class.cc',

+    'cpp_variant.cc',

+    'debugger.cc',

     'dom_operations.cc',

     'dom_serializer.cc',

-    'debugger.cc',

-    'cpp_variant.cc',

-    'cpp_bound_class.cc',

-    'cpp_binding_example.cc',

-    'context_menu_client_impl.cc',

-    'chrome_client_impl.cc',

-    'cache_manager.cc',

-    'alt_error_page_resource_fetcher.cc',

-    '$PENDING_DIR/AccessibleBase.cpp',

-    '$PENDING_DIR/AccessibleDocument.cpp',

+    'dragclient_impl.cc',

+    'editor_client_impl.cc',

+    'entity_map.cc',

+    'event_conversion.cc',

+    'feed_preview.cc',

+    'glue_serialize.cc',

+    'glue_util.cc',

+    'image_decoder.cc',

+    'image_resource_fetcher.cc',

+    'inspector_client_impl.cc',

+    'localized_strings.cc',

+    'multipart_response_delegate.cc',

+    'password_autocomplete_listener.cc',

+    'password_form_dom_manager.cc',

+    'plugins/mozilla_extensions.cc',

+    'plugins/plugin_data_stream.cc',

+    'plugins/plugin_host.cc',

+    'plugins/plugin_instance.cc',

+    'plugins/plugin_lib.cc',

+    'plugins/plugin_list.cc',

+    'plugins/plugin_stream.cc',

+    'plugins/plugin_stream_url.cc',

+    'plugins/plugin_string_stream.cc',

+    'plugins/webplugin_delegate_impl.cc',

+    'resource_fetcher.cc',

+    'resource_handle_win.cc',

+    'searchable_form_data.cc',

+    'simple_clipboard_impl.cc',

+    'webcursor.cc',

+    'webdatasource_impl.cc',

+    'webdocumentloader_impl.cc',

+    'webdropdata.cc',

+    'weberror_impl.cc',

+    'webframe_impl.cc',

+    'webframeloaderclient_impl.cc',

+    'webhistoryitem_impl.cc',

+    'webinputevent.cc',

+    'webkit_glue.cc',

+    'webplugin_impl.cc',

+    'webtextinput_impl.cc',

+    'weburlrequest_impl.cc',

+    'webview_impl.cc',

+    'webwidget_impl.cc',

 ]

 

 env.StaticLibrary('Glue', input_files)

diff --git a/webkit/glue/plugins/test/SConscript b/webkit/glue/plugins/test/SConscript
index f8113f6..9af7cdf 100644
--- a/webkit/glue/plugins/test/SConscript
+++ b/webkit/glue/plugins/test/SConscript
@@ -49,15 +49,13 @@ input_files = [
     'plugin_window_size_test.cc',
     'npapi_test.def',
 
-    env.File('$BASE_DIR/base.lib'),
+    '$BASE_DIR/base.lib',
 ]
 
 env.Append(
     CCFLAGS = [
         '/TP',
         '/wd4800',
-        '/wd4503',
-        '/wd4819',
     ],
 
     LIBS = [
diff --git a/webkit/tools/npapi_layout_test_plugin/SConscript b/webkit/tools/npapi_layout_test_plugin/SConscript
index 3536bd3..26b7896 100644
--- a/webkit/tools/npapi_layout_test_plugin/SConscript
+++ b/webkit/tools/npapi_layout_test_plugin/SConscript
@@ -44,8 +44,6 @@ env.Append(
     CCFLAGS = [
         '/TP',
         '/WX',
-        '/wd4503',
-        '/wd4819',
     ],
 
     LIBS = [
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index 3509a0c..a17cd8e 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -70,8 +70,6 @@ env.Append(
         '/TP',
         '/WX',
         '/Wp64',
-        '/wd4503',
-        '/wd4819',
     ],
 
     LIBS = [