This CL is for Neb. It contains his change 501124, with conflicts merged.

chrome/renderer/render_view.cc

Index: chrome/renderer/render_view.cc
===================================================================
--- chrome/renderer/render_view.cc	(revision 35905)
+++ chrome/renderer/render_view.cc	(working copy)
@@ -2674,21 +2674,21 @@
     }
   }
   if (in_process_plugin) {
-#if defined(OS_WIN)  // In-proc plugins aren't supported on Linux or Mac.
     if (use_pepper_host) {
       return WebPluginDelegatePepper::Create(
           path,
           *mime_type_to_use,
           AsWeakPtr(),
-          gfx::NativeViewFromId(host_window_));
+          0);
     } else {
+#if defined(OS_WIN)  // In-proc plugins aren't supported on Linux or Mac.
       return WebPluginDelegateImpl::Create(
           path, *mime_type_to_use, gfx::NativeViewFromId(host_window_));
-    }
 #else
-    NOTIMPLEMENTED();
-    return NULL;
+      NOTIMPLEMENTED();
+      return NULL;
 #endif
+    }
   }
 
   return new WebPluginDelegateProxy(*mime_type_to_use, AsWeakPtr());