Replace MSVC pragmas with the macro. Also adds two files

from webkit/glue to the build rule.

Patch from icefox (TorchMobile)
http://codereview.chromium.org/7418

Review URL: http://codereview.chromium.org/7454


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

52 files changed, 209 insertions, 112 deletions

diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript
index 2ce3611..74881d9 100644
--- a/webkit/glue/SConscript
+++ b/webkit/glue/SConscript
@@ -8,13 +8,13 @@ env = env.Clone()
 
 if env['PLATFORM'] == 'win32':
   env.Append(
-    CCFLAGS = [
-      '/TP',
+      CCFLAGS = [
+          '/TP',
 
-      '/WX',
+          '/WX',
 
-      '/wd4800',
-    ],
+          '/wd4800',
+      ],
   )
 
 input_files = [
@@ -29,6 +29,7 @@ input_files = [
   'cpp_variant.cc',
   'debugger.cc',
   'dom_operations.cc',
+  'dom_serializer.cc',
   'dragclient_impl.cc',
   'editor_client_impl.cc',
   'entity_map.cc',
@@ -45,6 +46,7 @@ input_files = [
   'password_autocomplete_listener.cc',
   'password_form_dom_manager.cc',
   'resource_fetcher.cc',
+  'resource_handle_impl.cc',
   'searchable_form_data.cc',
   'simple_clipboard_impl.cc',
   'stacking_order_iterator.cc',
@@ -68,7 +70,6 @@ if env['PLATFORM'] == 'win32':
   input_files.append([
     '$PENDING_DIR/AccessibleBase.cpp',
     '$PENDING_DIR/AccessibleDocument.cpp',
-    'dom_serializer.cc',
     'glue_accessibility.cc',
     'plugins/mozilla_extensions.cc',
     'plugins/plugin_host.cc',
@@ -79,7 +80,6 @@ if env['PLATFORM'] == 'win32':
     'plugins/plugin_stream_url.cc',
     'plugins/plugin_string_stream.cc',
     'plugins/webplugin_delegate_impl.cc',
-    'resource_handle_win.cc',
     'webdropdata.cc',
     'webinputevent_win.cc',
     'webplugin_impl.cc',
diff --git a/webkit/glue/alt_404_page_resource_fetcher.cc b/webkit/glue/alt_404_page_resource_fetcher.cc
index 234637e..66f1843 100644
--- a/webkit/glue/alt_404_page_resource_fetcher.cc
+++ b/webkit/glue/alt_404_page_resource_fetcher.cc
@@ -4,9 +4,11 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "DocumentLoader.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "webkit/glue/alt_404_page_resource_fetcher.h"
diff --git a/webkit/glue/alt_error_page_resource_fetcher.cc b/webkit/glue/alt_error_page_resource_fetcher.cc
index e80b1ab..7d04c4e 100644
--- a/webkit/glue/alt_error_page_resource_fetcher.cc
+++ b/webkit/glue/alt_error_page_resource_fetcher.cc
@@ -4,9 +4,11 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "ResourceResponse.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "webkit/glue/alt_error_page_resource_fetcher.h"
diff --git a/webkit/glue/alt_error_page_resource_fetcher.h b/webkit/glue/alt_error_page_resource_fetcher.h
index 4ba2540..171aad6 100644
--- a/webkit/glue/alt_error_page_resource_fetcher.h
+++ b/webkit/glue/alt_error_page_resource_fetcher.h
@@ -7,9 +7,11 @@
 
 #include <string>
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "Timer.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
diff --git a/webkit/glue/autocomplete_input_listener.cc b/webkit/glue/autocomplete_input_listener.cc
index 53f759e..02ac67f 100644
--- a/webkit/glue/autocomplete_input_listener.cc
+++ b/webkit/glue/autocomplete_input_listener.cc
@@ -7,7 +7,7 @@
 
 #include "webkit/glue/autocomplete_input_listener.h"
 
-#pragma warning(push, 0)
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "HTMLInputElement.h"
 #include "HTMLFormElement.h"
 #include "Document.h"
@@ -15,7 +15,7 @@
 #include "Editor.h"
 #include "EventNames.h"
 #include "Event.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 
diff --git a/webkit/glue/autocomplete_input_listener.h b/webkit/glue/autocomplete_input_listener.h
index 1db2ae1..56233a3 100644
--- a/webkit/glue/autocomplete_input_listener.h
+++ b/webkit/glue/autocomplete_input_listener.h
@@ -11,9 +11,11 @@
 #include <string>
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "EventListener.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "base/basictypes.h"
diff --git a/webkit/glue/autocomplete_input_listener_unittest.cc b/webkit/glue/autocomplete_input_listener_unittest.cc
index b33d42a..3223a38 100644
--- a/webkit/glue/autocomplete_input_listener_unittest.cc
+++ b/webkit/glue/autocomplete_input_listener_unittest.cc
@@ -11,7 +11,10 @@
 #include <string>
 
 #include "config.h"
-#pragma warning(push, 0)
+
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "HTMLInputElement.h"
 #include "HTMLFormElement.h"
 #include "Document.h"
@@ -20,7 +23,7 @@
 #include "EventNames.h"
 #include "Event.h"
 #include "EventListener.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 
diff --git a/webkit/glue/cache_manager.cc b/webkit/glue/cache_manager.cc
index 757b4f3..8f499f2 100644
--- a/webkit/glue/cache_manager.cc
+++ b/webkit/glue/cache_manager.cc
@@ -4,13 +4,15 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 // Instead of providing accessors, we make all members of Cache public.
 // This will make it easier to track WebKit changes to the Cache class.
 #define private public
 #include "Cache.h"
 #undef private
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 #include "base/logging.h"
diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc
index e44e48b..d2bbbb4 100644
--- a/webkit/glue/chrome_client_impl.cc
+++ b/webkit/glue/chrome_client_impl.cc
@@ -4,7 +4,9 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "FloatRect.h"
 #include "FileChooser.h"
 #include "FrameLoadRequest.h"
@@ -14,7 +16,7 @@
 #include "Page.h"
 #include "ScriptController.h"
 #include "WindowFeatures.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "webkit/glue/chrome_client_impl.h"
diff --git a/webkit/glue/chrome_client_impl.h b/webkit/glue/chrome_client_impl.h
index d840423..a070fd1 100644
--- a/webkit/glue/chrome_client_impl.h
+++ b/webkit/glue/chrome_client_impl.h
@@ -5,9 +5,11 @@
 #ifndef WEBKIT_GLUE_CHROME_CLIENT_IMPL_H__
 #define WEBKIT_GLUE_CHROME_CLIENT_IMPL_H__
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "ChromeClientChromium.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 class WebViewImpl;
 namespace WebCore {
diff --git a/webkit/glue/context_menu_client_impl.cc b/webkit/glue/context_menu_client_impl.cc
index fe287bf..ddde662 100644
--- a/webkit/glue/context_menu_client_impl.cc
+++ b/webkit/glue/context_menu_client_impl.cc
@@ -4,7 +4,9 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "ContextMenu.h"
 #include "Document.h"
 #include "DocumentLoader.h"
@@ -14,7 +16,7 @@
 #include "HitTestResult.h"
 #include "KURL.h"
 #include "Widget.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "webkit/glue/context_menu_client_impl.h"
diff --git a/webkit/glue/context_menu_client_impl.h b/webkit/glue/context_menu_client_impl.h
index ec6d49a..59519b2 100644
--- a/webkit/glue/context_menu_client_impl.h
+++ b/webkit/glue/context_menu_client_impl.h
@@ -7,9 +7,11 @@
 
 #include "build/build_config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "ContextMenuClient.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 class WebViewImpl;
 
diff --git a/webkit/glue/cpp_variant_unittest.cc b/webkit/glue/cpp_variant_unittest.cc
index f8d0e27..bb3ecc8 100644
--- a/webkit/glue/cpp_variant_unittest.cc
+++ b/webkit/glue/cpp_variant_unittest.cc
@@ -4,12 +4,14 @@
 
 #include "config.h"
 
+#include "base/compiler_specific.h"
+
 #include "webkit/glue/cpp_variant.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#pragma warning(push, 0)
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "npruntime_priv.h"  // for NPN_InitializeVariantWithStringCopy
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #if USE(JSC)
 #define _NPN_InitializeVariantWithStringCopy NPN_InitializeVariantWithStringCopy
diff --git a/webkit/glue/dom_operations.cc b/webkit/glue/dom_operations.cc
index d6bdd23..fe039a7 100644
--- a/webkit/glue/dom_operations.cc
+++ b/webkit/glue/dom_operations.cc
@@ -4,7 +4,9 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "FrameLoader.h"
 #include "FrameTree.h"
 #include "Document.h"
@@ -21,7 +23,7 @@
 #include "HTMLMetaElement.h"
 #include "HTMLNames.h"
 #include "KURL.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 // Brings in more WebKit headers and #undefs LOG again, so this needs to come
diff --git a/webkit/glue/dom_serializer.cc b/webkit/glue/dom_serializer.cc
index b510b28..dd415a5 100644
--- a/webkit/glue/dom_serializer.cc
+++ b/webkit/glue/dom_serializer.cc
@@ -51,7 +51,9 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "DocumentType.h"
 #include "FrameLoader.h"
 #include "Document.h"
@@ -65,7 +67,7 @@
 #include "markup.h"
 #include "PlatformString.h"
 #include "TextEncoding.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "webkit/glue/dom_serializer.h"
diff --git a/webkit/glue/dom_serializer_unittest.cc b/webkit/glue/dom_serializer_unittest.cc
index da9d957..6c0f091 100644
--- a/webkit/glue/dom_serializer_unittest.cc
+++ b/webkit/glue/dom_serializer_unittest.cc
@@ -4,7 +4,9 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "Document.h"
 #include "DocumentType.h"
 #include "Element.h"
@@ -17,7 +19,7 @@
 #include "markup.h"
 #include "SharedBuffer.h"
 #include "SubstituteData.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "base/hash_tables.h"
diff --git a/webkit/glue/dragclient_impl.cc b/webkit/glue/dragclient_impl.cc
index bc43fc3..b0f1cf8 100644
--- a/webkit/glue/dragclient_impl.cc
+++ b/webkit/glue/dragclient_impl.cc
@@ -4,13 +4,15 @@
 
 #include "config.h"
 
+#include "base/compiler_specific.h"
+
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <objidl.h>
 #endif
 
-#pragma warning(push, 0)
+MSVC_PUSH_WARNING_LEVEL(0);
 #if defined(OS_WIN)
 #include "ClipboardWin.h"
 #include "COMPtr.h"
@@ -20,7 +22,7 @@
 #include "HitTestResult.h"
 #include "Image.h"
 #include "KURL.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "webkit/glue/dragclient_impl.h"
diff --git a/webkit/glue/dragclient_impl.h b/webkit/glue/dragclient_impl.h
index cfe1745..8673301 100644
--- a/webkit/glue/dragclient_impl.h
+++ b/webkit/glue/dragclient_impl.h
@@ -6,11 +6,12 @@
 #define WEBKIT_GLUE_DRAGCLIENT_IMPL_H__
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 
-#pragma warning(push, 0)
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "DragClient.h"
 #include "DragActions.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 namespace WebCore {
 class ClipBoard;
diff --git a/webkit/glue/editor_client_impl.cc b/webkit/glue/editor_client_impl.cc
index 74fce21..04a9ac5 100644
--- a/webkit/glue/editor_client_impl.cc
+++ b/webkit/glue/editor_client_impl.cc
@@ -6,7 +6,10 @@
 // and I'm not really sure what to do about most of them.
 
 #include "config.h"
-#pragma warning(push, 0)
+
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "Document.h"
 #include "EditCommand.h"
 #include "Editor.h"
@@ -17,7 +20,7 @@
 #include "KeyboardEvent.h"
 #include "PlatformKeyboardEvent.h"
 #include "PlatformString.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 #include "base/string_util.h"
diff --git a/webkit/glue/editor_client_impl.h b/webkit/glue/editor_client_impl.h
index 8ece82f..0ef68c58 100644
--- a/webkit/glue/editor_client_impl.h
+++ b/webkit/glue/editor_client_impl.h
@@ -5,13 +5,15 @@
 #ifndef WEBKIT_GLUE_EDITOR_CLIENT_IMPL_H__
 #define WEBKIT_GLUE_EDITOR_CLIENT_IMPL_H__
 
+#include "base/compiler_specific.h"
+
 #include "build/build_config.h"
 
 #include <deque>
 
-#pragma warning(push, 0)
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "EditorClient.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 namespace WebCore {
 class Frame;
diff --git a/webkit/glue/event_conversion.cc b/webkit/glue/event_conversion.cc
index af476c2..91100c6 100644
--- a/webkit/glue/event_conversion.cc
+++ b/webkit/glue/event_conversion.cc
@@ -4,12 +4,15 @@
 
 #include "config.h"
 
+#include "base/compiler_specific.h"
+
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include "StringImpl.h"  // This is so that the KJS build works
-#pragma warning(push, 0)
+
+MSVC_PUSH_WARNING_LEVEL(0);
 // HACK: make it possible to initialize these classes...
 // TODO(darin): send this change to webkit.org
 #define private protected
@@ -18,7 +21,7 @@
 #include "PlatformWheelEvent.h"
 #undef private
 #include "Widget.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 #include "base/gfx/point.h"
diff --git a/webkit/glue/feed_preview.cc b/webkit/glue/feed_preview.cc
index 6edca9e..f7ad688 100644
--- a/webkit/glue/feed_preview.cc
+++ b/webkit/glue/feed_preview.cc
@@ -4,13 +4,15 @@
 
 #include "config.h"
 
+#include "base/compiler_specific.h"
+
 #include "webkit/glue/feed_preview.h"
 
-#pragma warning(push, 0)
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "ResourceHandle.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 
diff --git a/webkit/glue/feed_preview.h b/webkit/glue/feed_preview.h
index c5c585b..f81bcea 100644
--- a/webkit/glue/feed_preview.h
+++ b/webkit/glue/feed_preview.h
@@ -11,9 +11,11 @@
 
 #include <string>
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "ResourceHandleClient.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 namespace WebCore {
 
diff --git a/webkit/glue/glue_serialize.cc b/webkit/glue/glue_serialize.cc
index 925da42..dc44c20 100644
--- a/webkit/glue/glue_serialize.cc
+++ b/webkit/glue/glue_serialize.cc
@@ -5,11 +5,13 @@
 #include "config.h"
 #include <string>
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "HistoryItem.h"
 #include "PlatformString.h"
 #include "ResourceRequest.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "webkit/glue/glue_serialize.h"
diff --git a/webkit/glue/glue_serialize_unittest.cc b/webkit/glue/glue_serialize_unittest.cc
index 48bfb4c5..a117d14 100644
--- a/webkit/glue/glue_serialize_unittest.cc
+++ b/webkit/glue/glue_serialize_unittest.cc
@@ -7,15 +7,16 @@
 
 #include "webkit/glue/glue_serialize.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "base/compiler_specific.h"
 #include "base/pickle.h"
 
-#pragma warning(push, 0)
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "CString.h"
 #include "FormData.h"
 #include "HistoryItem.h"
 #include "PlatformString.h"
 #include "ResourceRequest.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 using namespace std;
 using namespace WebCore;
diff --git a/webkit/glue/glue_util.cc b/webkit/glue/glue_util.cc
index ed24b39..b45134b 100644
--- a/webkit/glue/glue_util.cc
+++ b/webkit/glue/glue_util.cc
@@ -6,13 +6,14 @@
 #include <string>
 
 #include "webkit/glue/glue_util.h"
+#include "base/compiler_specific.h"
 #include "base/string_util.h"
 
-#pragma warning(push, 0)
+MSVC_PUSH_WARNING_LEVEL(0);
 #undef LOG
 #include "CString.h"
 #include "PlatformString.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #include "KURL.h"
 
diff --git a/webkit/glue/image_decoder.cc b/webkit/glue/image_decoder.cc
index f63b808..9b4f294 100644
--- a/webkit/glue/image_decoder.cc
+++ b/webkit/glue/image_decoder.cc
@@ -5,7 +5,9 @@
 #include "config.h"
 #include "webkit/glue/image_decoder.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #if defined(OS_WIN) || defined(OS_LINUX)
 #include "ImageSourceSkia.h"
 #elif defined(OS_MACOSX)
@@ -15,7 +17,7 @@
 #include "IntSize.h"
 #include "RefPtr.h"
 #include "SharedBuffer.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #include "SkBitmap.h"
 
diff --git a/webkit/glue/image_resource_fetcher.cc b/webkit/glue/image_resource_fetcher.cc
index 5b39dfe..0e09ff5 100644
--- a/webkit/glue/image_resource_fetcher.cc
+++ b/webkit/glue/image_resource_fetcher.cc
@@ -4,9 +4,11 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "ImageSourceSkia.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "webkit/glue/image_resource_fetcher.h"
diff --git a/webkit/glue/inspector_client_impl.cc b/webkit/glue/inspector_client_impl.cc
index 4bd30236..b87afbb 100644
--- a/webkit/glue/inspector_client_impl.cc
+++ b/webkit/glue/inspector_client_impl.cc
@@ -4,12 +4,14 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "FloatRect.h"
 #include "InspectorController.h"
 #include "Page.h"
 #include "Settings.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 #include "webkit/glue/inspector_client_impl.h"
diff --git a/webkit/glue/multipart_response_delegate.cc b/webkit/glue/multipart_response_delegate.cc
index 19f5fea..72d4158 100644
--- a/webkit/glue/multipart_response_delegate.cc
+++ b/webkit/glue/multipart_response_delegate.cc
@@ -5,12 +5,14 @@
 #include "config.h"
 #include <string>
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "HTTPHeaderMap.h"
 #include "ResourceHandle.h"
 #include "ResourceHandleClient.h"
 #include "PlatformString.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 #include "base/logging.h"
diff --git a/webkit/glue/multipart_response_delegate.h b/webkit/glue/multipart_response_delegate.h
index e7c1ba4..185a0aa 100644
--- a/webkit/glue/multipart_response_delegate.h
+++ b/webkit/glue/multipart_response_delegate.h
@@ -50,9 +50,12 @@
 #include <string>
 
 #include "config.h"
-#pragma warning(push, 0)
+
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "ResourceResponse.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 namespace WebCore {
   class ResourceHandle;
diff --git a/webkit/glue/multipart_response_delegate_unittest.cc b/webkit/glue/multipart_response_delegate_unittest.cc
index e5fd0c6..325b8ad 100644
--- a/webkit/glue/multipart_response_delegate_unittest.cc
+++ b/webkit/glue/multipart_response_delegate_unittest.cc
@@ -6,13 +6,15 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "KURL.h"
 #include "ResourceResponse.h"
 #include "ResourceHandle.h"
 #include "ResourceHandleClient.h"
 #include "String.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #include "base/basictypes.h"
 #include "webkit/glue/glue_util.h"
diff --git a/webkit/glue/password_autocomplete_listener_unittest.cc b/webkit/glue/password_autocomplete_listener_unittest.cc
index 04c1542..072cdff 100644
--- a/webkit/glue/password_autocomplete_listener_unittest.cc
+++ b/webkit/glue/password_autocomplete_listener_unittest.cc
@@ -8,7 +8,10 @@
 
 #include <string>
 #include "config.h"
-#pragma warning(push, 0)
+
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "HTMLInputElement.h"
 #include "HTMLFormElement.h"
 #include "Document.h"
@@ -17,7 +20,7 @@
 #include "EventNames.h"
 #include "Event.h"
 #include "EventListener.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 
diff --git a/webkit/glue/password_form_dom_manager.cc b/webkit/glue/password_form_dom_manager.cc
index f3a62a0..956a55e 100644
--- a/webkit/glue/password_form_dom_manager.cc
+++ b/webkit/glue/password_form_dom_manager.cc
@@ -4,7 +4,9 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "Frame.h"
@@ -13,7 +15,7 @@
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
 #include "KURL.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 
diff --git a/webkit/glue/regular_expression_unittest.cc b/webkit/glue/regular_expression_unittest.cc
index 3e22ada..719879b 100644
--- a/webkit/glue/regular_expression_unittest.cc
+++ b/webkit/glue/regular_expression_unittest.cc
@@ -4,10 +4,12 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "PlatformString.h"
 #include "RegularExpression.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/glue_util.h"
diff --git a/webkit/glue/resource_fetcher.cc b/webkit/glue/resource_fetcher.cc
index 1e8be69..ac91399 100644
--- a/webkit/glue/resource_fetcher.cc
+++ b/webkit/glue/resource_fetcher.cc
@@ -5,11 +5,13 @@
 #include "config.h"
 #include "webkit/glue/resource_fetcher.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "FrameLoader.h"
 #include "ResourceHandle.h"
 #include "ResourceRequest.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 #include "base/logging.h"
diff --git a/webkit/glue/resource_fetcher.h b/webkit/glue/resource_fetcher.h
index 174f3bb..91d08a1 100644
--- a/webkit/glue/resource_fetcher.h
+++ b/webkit/glue/resource_fetcher.h
@@ -18,12 +18,14 @@
 #include "base/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "Frame.h"
 #include "Timer.h"
 #include "ResourceHandleClient.h"
 #include "ResourceResponse.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 class GURL;
 
diff --git a/webkit/glue/resource_fetcher_unittest.cc b/webkit/glue/resource_fetcher_unittest.cc
index 507f74a..86ec091 100644
--- a/webkit/glue/resource_fetcher_unittest.cc
+++ b/webkit/glue/resource_fetcher_unittest.cc
@@ -4,9 +4,11 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "ResourceResponse.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "webkit/glue/unittest_test_server.h"
diff --git a/webkit/glue/resource_handle_impl.cc b/webkit/glue/resource_handle_impl.cc
index 424d344..058a6ca 100644
--- a/webkit/glue/resource_handle_impl.cc
+++ b/webkit/glue/resource_handle_impl.cc
@@ -24,7 +24,9 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "CString.h"
 #include "Console.h"
 #include "DocLoader.h"
@@ -37,7 +39,7 @@
 #include "ResourceHandleClient.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 #include "base/logging.h"
@@ -251,12 +253,12 @@ ResourceHandleInternal::ResourceHandleInternal(ResourceHandle* job,
     : job_(job),
       client_(c),
       request_(r),
+MSVC_SUPPRESS_WARNING(4355)  // can use this
+      data_url_factory_(this),
       load_flags_(net::LOAD_NORMAL),
       pending_(false),
       expected_content_length_(-1),
-      multipart_delegate_(NULL),
-MSVC_SUPPRESS_WARNING(4355)  // can use this
-      data_url_factory_(this) {
+      multipart_delegate_(NULL) {
 }
 
 ResourceHandleInternal::~ResourceHandleInternal() {
diff --git a/webkit/glue/searchable_form_data.cc b/webkit/glue/searchable_form_data.cc
index 44dc62a..cd0a88f 100644
--- a/webkit/glue/searchable_form_data.cc
+++ b/webkit/glue/searchable_form_data.cc
@@ -4,7 +4,9 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "CString.h"
 #include "Document.h"
 #include "DocumentLoader.h"
diff --git a/webkit/glue/webdatasource_impl.cc b/webkit/glue/webdatasource_impl.cc
index 3aca942..b8043b1 100644
--- a/webkit/glue/webdatasource_impl.cc
+++ b/webkit/glue/webdatasource_impl.cc
@@ -25,11 +25,13 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "KURL.h"
 #include "FrameLoadRequest.h"
 #include "ResourceRequest.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "base/string_util.h"
diff --git a/webkit/glue/webdocumentloader_impl.h b/webkit/glue/webdocumentloader_impl.h
index 4f7fa14..8a739bf 100644
--- a/webkit/glue/webdocumentloader_impl.h
+++ b/webkit/glue/webdocumentloader_impl.h
@@ -29,9 +29,11 @@
 #ifndef WEBKIT_GLUE_WEBDOCUMENTLOADER_IMPL_H__
 #define WEBKIT_GLUE_WEBDOCUMENTLOADER_IMPL_H__
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "DocumentLoader.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 6ef003b..4710e21 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -77,12 +77,13 @@
 
 #include "config.h"
 
+#include "base/compiler_specific.h"
 #include "build/build_config.h"
 
 #include <algorithm>
 #include <string>
 
-#pragma warning(push, 0)
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "HTMLFormElement.h"  // need this before Document.h
 #include "Chrome.h"
 #include "ChromeClientChromium.h"
@@ -122,7 +123,7 @@
 #include "WidgetClientChromium.h"
 #include "XPathResult.h"
 
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 #include "base/gfx/bitmap_platform_device.h"
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index 2780849..36c7393 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -6,7 +6,9 @@
 #include <string>
 #include <vector>
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "Chrome.h"
 #include "CString.h"
 #include "Document.h"
@@ -25,7 +27,7 @@
 #include "PluginInfoStore.h"
 #include "RefPtr.h"
 #include "WindowFeatures.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 #include "base/basictypes.h"
diff --git a/webkit/glue/webhistoryitem_impl.cc b/webkit/glue/webhistoryitem_impl.cc
index 7ee880d..137086c 100644
--- a/webkit/glue/webhistoryitem_impl.cc
+++ b/webkit/glue/webhistoryitem_impl.cc
@@ -28,9 +28,11 @@
 
 #include "webkit/glue/glue_serialize.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "HistoryItem.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 
 WebHistoryItem* WebHistoryItem::Create(const GURL& url,
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index b81458c..3c1cc0b 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -4,7 +4,9 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "Document.h"
 #include "Element.h"
 #include "Event.h"
@@ -32,7 +34,7 @@
 #include "ScriptController.h"
 #include "ScrollView.h"
 #include "Widget.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "base/gfx/rect.h"
diff --git a/webkit/glue/webplugin_impl.h b/webkit/glue/webplugin_impl.h
index 781369e..33595cb 100644
--- a/webkit/glue/webplugin_impl.h
+++ b/webkit/glue/webplugin_impl.h
@@ -10,13 +10,14 @@
 #include <vector>
 
 #include "config.h"
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "ResourceHandle.h"
 #include "ResourceHandleClient.h"
 #include "ResourceRequest.h"
 #include "Widget.h"
-#include "Vector.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
diff --git a/webkit/glue/webplugin_impl_unittest.cc b/webkit/glue/webplugin_impl_unittest.cc
index 69964b3..882c1de 100644
--- a/webkit/glue/webplugin_impl_unittest.cc
+++ b/webkit/glue/webplugin_impl_unittest.cc
@@ -6,10 +6,12 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "ResourceRequest.h"
 #include "CString.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "webkit/glue/webplugin_impl.h"
diff --git a/webkit/glue/webtextinput_impl.cc b/webkit/glue/webtextinput_impl.cc
index d1b64312..015da9c 100644
--- a/webkit/glue/webtextinput_impl.cc
+++ b/webkit/glue/webtextinput_impl.cc
@@ -5,10 +5,12 @@
 #include <ctype.h>
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "Frame.h"
 #include "Editor.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index 6697970..4676b92 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -33,8 +33,8 @@
 #include "config.h"
 #include "build/build_config.h"
 
-#pragma warning(push, 0)
 #if defined(OS_WIN)
+#include "base/compiler_specific.h"
 #include "Cursor.h"
 #endif
 #include "Document.h"
@@ -68,7 +68,7 @@
 #include "Settings.h"
 #include "TypingCommand.h"
 #include "event_conversion.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 #undef LOG
 
 #include "base/gfx/rect.h"
diff --git a/webkit/glue/webwidget_impl.cc b/webkit/glue/webwidget_impl.cc
index 90893d2..c93e75f 100644
--- a/webkit/glue/webwidget_impl.cc
+++ b/webkit/glue/webwidget_impl.cc
@@ -4,7 +4,9 @@
 
 #include "config.h"
 
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "Cursor.h"
 #include "FramelessScrollView.h"
 #include "FrameView.h"
@@ -13,7 +15,7 @@
 #include "PlatformMouseEvent.h"
 #include "PlatformWheelEvent.h"
 #include "SkiaUtils.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 #undef LOG
 #include "base/gfx/platform_canvas.h"
diff --git a/webkit/glue/webwidget_impl.h b/webkit/glue/webwidget_impl.h
index 2c7ced3..32bcbde 100644
--- a/webkit/glue/webwidget_impl.h
+++ b/webkit/glue/webwidget_impl.h
@@ -6,14 +6,15 @@
 #define WEBKIT_GLUE_WEBWIDGET_IMPL_H__
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
 #include "webkit/glue/webwidget.h"
 
-#pragma warning(push, 0)
+MSVC_PUSH_WARNING_LEVEL(0);
 #include "WidgetClientChromium.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
 
 namespace WebCore {
   class Frame;