Revert 80819 due to failed tests

chrome/renderer/renderer_glue.cc

 // Copyright (c) 2011 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.
 
 // This file provides the embedder's side of random webkit glue functions.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 25 matching lines @@
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/scoped_clipboard_writer_glue.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/websocketstreamhandle_bridge.h"
 
 #if !defined(DISABLE_NACL)
 #include "native_client/src/shared/imc/nacl_imc.h"
 #include "native_client/src/trusted/plugin/nacl_entry_points.h"
 #endif
 
-#if defined(OS_LINUX)
+#if defined(OS_WIN)
+#include <strsafe.h>  // note: per msdn docs, this must *follow* other includes
+#elif defined(OS_LINUX)
 #include "content/renderer/renderer_sandbox_support_linux.h"
 #endif
 
 // This definition of WriteBitmapFromPixels uses shared memory to communicate
 // across processes.
 void ScopedClipboardWriterGlue::WriteBitmapFromPixels(const void* pixels,
                                                       const gfx::Size& size) {
   // Do not try to write a bitmap more than once
   if (shared_buf_)
     return;
@@ skipping 257 matching lines @@
 }
 
 bool GetFontTable(int fd, uint32_t table, uint8_t* output,
                   size_t* output_length) {
   return renderer_sandbox_support::GetFontTable(
       fd, table, output, output_length);
 }
 #endif
 
 }  // namespace webkit_glue