Reverting this to see if the Flash crashes on Mac canary are due to this CL.

webkit/plugins/npapi/webplugin.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_H_
 #define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 74 matching lines @@
   // windowless plugins and is used in NPP_HandleEvent calls to pump messages
   // if the plugin enters a modal loop.
   // Cancels a pending request.
   virtual void SetWindowlessPumpEvent(HANDLE pump_messages_event) = 0;
   virtual void ReparentPluginWindow(HWND window, HWND parent) = 0;
 #endif
   virtual void CancelResource(unsigned long id) = 0;
   virtual void Invalidate() = 0;
   virtual void InvalidateRect(const gfx::Rect& rect) = 0;
 
-  // Returns the NPObject for the browser's window object. Does not
-  // take a reference.
+  // Returns the NPObject for the browser's window object.
   virtual NPObject* GetWindowScriptNPObject() = 0;
 
-  // Returns the DOM element that loaded the plugin. Does not take a
-  // reference.
+  // Returns the DOM element that loaded the plugin.
   virtual NPObject* GetPluginElement() = 0;
 
   // Cookies
   virtual void SetCookie(const GURL& url,
                          const GURL& first_party_for_cookies,
                          const std::string& cookie) = 0;
   virtual std::string GetCookies(const GURL& url,
                                  const GURL& first_party_for_cookies) = 0;
 
   // When a default plugin has downloaded the plugin list and finds it is
@@ skipping 79 matching lines @@
   virtual void DidFinishLoading() = 0;
   virtual void DidFail() = 0;
   virtual bool IsMultiByteResponseExpected() = 0;
   virtual int ResourceId() = 0;
 };
 
 }  // namespace npapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_H_