Remove BrowserPlugin's -internal-attach method

chrome/renderer/resources/extensions/extension_options.js

 // Copyright 2014 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.
 
 var DocumentNatives = requireNative('document_natives');
 var ExtensionOptionsEvents =
     require('extensionOptionsEvents').ExtensionOptionsEvents;
 var GuestViewInternal =
     require('binding').Binding.create('guestViewInternal').generate();
 var IdGenerator = requireNative('id_generator');
 var utils = require('utils');
+var guestViewInternalNatives = requireNative('guest_view_internal');
 
 // Mapping of the autosize attribute names to default values
 var AUTO_SIZE_ATTRIBUTES = {
   'autosize': 'on',
   'maxheight': 600,
   'maxwidth': 800,
   'minheight': 32,
   'minwidth': 80
 };
 
@@ skipping 12 matching lines @@
   this.setupEventProperty('createfailed');
 
   new ExtensionOptionsEvents(this, this.viewInstanceId);
 
   this.setupNodeProperties();
 
   if (this.parseExtensionAttribute())
     this.init();
 };
 
-ExtensionOptionsInternal.prototype.attachWindow = function(instanceId) {
-  this.instanceId = instanceId;
+ExtensionOptionsInternal.prototype.attachWindow = function(guestInstanceId) {
+  this.guestInstanceId = guestInstanceId;
   var params = {
     'autosize': this.autosize,
     'instanceId': this.viewInstanceId,
     'maxheight': parseInt(this.maxheight || 0),
     'maxwidth': parseInt(this.maxwidth || 0),
     'minheight': parseInt(this.minheight || 0),
     'minwidth': parseInt(this.minwidth || 0)
-  }
-  return this.browserPluginNode['-internal-attach'](instanceId, params);
+  };
+  return guestViewInternalNatives.AttachGuest(
+      parseInt(this.browserPluginNode.getAttribute('internalinstanceid')),
+      guestInstanceId,
+      params);
 };
 
 ExtensionOptionsInternal.prototype.createBrowserPluginNode = function() {
   var browserPluginNode = new ExtensionOptionsInternal.BrowserPlugin();
   privates(browserPluginNode).internal = this;
   return browserPluginNode;
 };
 
 ExtensionOptionsInternal.prototype.createGuest = function() {
   var params = {
     'extensionId': this.extensionId,
   };
   GuestViewInternal.createGuest(
       'extensionoptions',
       params,
-      function(instanceId) {
-        if (instanceId == 0) {
+      function(guestInstanceId) {
+        if (guestInstanceId == 0) {
           // Fire a createfailed event here rather than in ExtensionOptionsGuest
           // because the guest will not be created, and cannot fire an event.
           this.initCalled = false;
           var createFailedEvent = new Event('createfailed', { bubbles: true });
           this.dispatchEvent(createFailedEvent);
         } else {
-          this.attachWindow(instanceId);
+          this.attachWindow(guestInstanceId);
         }
       }.bind(this));
 };
 
 ExtensionOptionsInternal.prototype.dispatchEvent =
     function(extensionOptionsEvent) {
   return this.extensionoptionsNode.dispatchEvent(extensionOptionsEvent);
 };
 
 ExtensionOptionsInternal.prototype.handleExtensionOptionsAttributeMutation =
     function(name, oldValue, newValue) {
   // We treat null attribute (attribute removed) and the empty string as
   // one case.
   oldValue = oldValue || '';
   newValue = newValue || '';
 
   if (oldValue === newValue)
     return;
 
   if (name == 'extension') {
     this.extensionId = newValue;
     // Create new guest view if one hasn't been created for this element.
-    if (!this.instanceId && this.parseExtensionAttribute())
+    if (!this.guestInstanceId && this.parseExtensionAttribute())
       this.init();
     // TODO(ericzeng): Implement navigation to another guest view if we want
     // that functionality.
   } else if (AUTO_SIZE_ATTRIBUTES.hasOwnProperty(name) > -1) {
     this[name] = newValue;
     this.resetSizeConstraintsIfInvalid();
 
-    if (!this.instanceId)
+    if (!this.guestInstanceId)
       return;
 
-    GuestViewInternal.setAutoSize(this.instanceId, {
+    GuestViewInternal.setAutoSize(this.guestInstanceId, {
       'enableAutoSize': this.extensionoptionsNode.hasAttribute('autosize'),
       'min': {
         'width': parseInt(this.minwidth || 0),
         'height': parseInt(this.minheight || 0)
       },
       'max': {
         'width': parseInt(this.maxwidth || 0),
         'height': parseInt(this.maxheight || 0)
       }
     });
@@ skipping 141 matching lines @@
 
 var useCapture = true;
 window.addEventListener('readystatechange', function listener(event) {
   if (document.readyState == 'loading')
     return;
 
   registerBrowserPluginElement();
   registerExtensionOptionsElement();
   window.removeEventListener(event.type, listener, useCapture);
 }, useCapture);