Various webview cleanup.

extensions/renderer/resources/guest_view/web_view_events.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.
 
 // Event management for WebView.
 
 var DeclarativeWebRequestSchema =
     requireNative('schema_registry').GetSchema('declarativeWebRequest');
 var EventBindings = require('event_bindings');
 var IdGenerator = requireNative('id_generator');
@@ skipping 173 matching lines @@
   this.permissionTypes = ['media',
                           'geolocation',
                           'pointerLock',
                           'download',
                           'loadplugin',
                           'filesystem'];
 
   // Set up the events.
   this.setupFrameNameChangedEvent();
   this.setupWebRequestEvents();
-  this.webViewImpl.setupExperimentalContextMenus();
   var events = this.getEvents();
   for (var eventName in events) {
     this.setupEvent(eventName, events[eventName]);
   }
 }
 
 WebViewEvents.prototype.setupFrameNameChangedEvent = function() {
   FrameNameChangedEvent.addListener(function(e) {
     this.webViewImpl.onFrameNameChanged(e.name);
   }.bind(this), {instanceId: this.viewInstanceId});
@@ skipping 57 matching lines @@
           get: webRequestEvent,
           enumerable: true
         }
     );
   }
 
   this.webViewImpl.setRequestPropertyOnWebViewNode(request);
 };
 
 WebViewEvents.prototype.getEvents = function() {
-  var experimentalEvents = this.webViewImpl.maybeGetExperimentalEvents();
-  for (var eventName in experimentalEvents) {
-    WEB_VIEW_EVENTS[eventName] = experimentalEvents[eventName];
-  }
   var chromeEvents = this.webViewImpl.maybeGetChromeWebViewEvents();
   for (var eventName in chromeEvents) {
     WEB_VIEW_EVENTS[eventName] = chromeEvents[eventName];
   }
   return WEB_VIEW_EVENTS;
 };
 
 WebViewEvents.prototype.setupEvent = function(name, info) {
   info.evt.addListener(function(e) {
     var details = {bubbles: true};
@@ skipping 34 matching lines @@
     var ERROR_MSG_DIALOG_ACTION_ALREADY_TAKEN = '<webview>: ' +
         'An action has already been taken for this "dialog" event.';
 
     if (actionTaken) {
       throw new Error(ERROR_MSG_DIALOG_ACTION_ALREADY_TAKEN);
     }
     actionTaken = true;
   };
 
   var getGuestInstanceId = function() {
-    return this.webViewImpl.getGuestInstanceId();
+    return this.webViewImpl.guestInstanceId;
   }.bind(this);
 
   var dialog = {
     ok: function(user_input) {
       validateCall();
       user_input = user_input || '';
       WebViewInternal.setPermission(getGuestInstanceId(), requestId, 'allow',
                             user_input);
     },
     cancel: function() {
@@ skipping 256 matching lines @@
   }
 };
 
 WebViewEvents.prototype.handleSizeChangedEvent = function(
     event, webViewEvent) {
   this.webViewImpl.onSizeChanged(webViewEvent);
 };
 
 exports.WebViewEvents = WebViewEvents;
 exports.CreateEvent = CreateEvent;