Revert 171569 as it broke some browser_tests on win_aura.

ui/gfx/native_widget_types.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_GFX_NATIVE_WIDGET_TYPES_H_
 #define UI_GFX_NATIVE_WIDGET_TYPES_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_ANDROID)
@@ skipping 260 matching lines @@
   // pointer on 64-bit architectures in case we need this capability.
   typedef uint64 PluginWindowHandle;
   const PluginWindowHandle kNullPluginWindow = 0;
 #endif
 
 struct GLSurfaceHandle {
   GLSurfaceHandle()
       : handle(kNullPluginWindow),
         transport(false),
         parent_gpu_process_id(0),
-        parent_client_id(0) {
+        parent_client_id(0),
+        parent_context_id(0),
+        sync_point(0) {
+    parent_texture_id[0] = 0;
+    parent_texture_id[1] = 0;
   }
   GLSurfaceHandle(PluginWindowHandle handle_, bool transport_)
       : handle(handle_),
         transport(transport_),
         parent_gpu_process_id(0),
-        parent_client_id(0) {
+        parent_client_id(0),
+        parent_context_id(0),
+        sync_point(0) {
+    parent_texture_id[0] = 0;
+    parent_texture_id[1] = 0;
   }
   bool is_null() const { return handle == kNullPluginWindow && !transport; }
   PluginWindowHandle handle;
   bool transport;
   int parent_gpu_process_id;
   uint32 parent_client_id;
+  uint32 parent_context_id;
+  uint32 parent_texture_id[2];
+  uint32 sync_point;
 };
 
 // AcceleratedWidget provides a surface to compositors to paint pixels.
 #if defined(OS_WIN)
 typedef HWND AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = NULL;
 #elif defined(USE_X11)
 typedef unsigned long AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = 0;
 #elif defined(OS_IOS)
 typedef UIView* AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = 0;
 #elif defined(OS_MACOSX)
 typedef NSView* AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = 0;
 #elif defined(OS_ANDROID)
 typedef ANativeWindow* AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = 0;
 #else
 #error unknown platform
 #endif
 
 }  // namespace gfx
 
 #endif  // UI_GFX_NATIVE_WIDGET_TYPES_H_