[Webapp Refactor] Reparent the ConnectedView into the delegate.

remoting/webapp/browser_test/bump_scroll_browser_test.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.
 
 /**
  * @fileoverview
  * @suppress {checkTypes}
  * Browser test for the scenario below:
  * 1. Enter full-screen mode
  * 2. Move the mouse to each edge; verify that the desktop bump-scrolls.
@@ skipping 38 matching lines @@
 browserTest.FakeDesktopViewport.prototype.getBumpScrollerForTesting =
     function() {
   return this.bumpScroller_;
 };
 
 browserTest.FakeDesktopViewport.prototype.raiseEvent =
     function() {
   return this.bumpScroller_.raiseEvent.apply(this.bumpScroller_, arguments);
 };
 
+/** @return {remoting.DesktopViewport} */
+function getViewportForTesting() {
+  var view = remoting.desktopDelegateForTesting.getConnectedViewForTesting();
+  if (view) {
+    return view.getViewportForTesting();
+  }
+  return null;
+}
 
 /** @constructor */
 browserTest.Bump_Scroll = function() {
   // To avoid dependencies on the actual host desktop size, we simulate a
   // desktop larger or smaller than the client window. The exact value is
   // arbitrary, but must be positive.
   /** @type {number} */
   this.kHostDesktopSizeDelta = 10;
 };
 
@@ skipping 38 matching lines @@
       browserTest.disconnect();
       return browserTest.fail(error);
     }
   );
 };
 
 /**
  * @return {Promise}
  */
 browserTest.Bump_Scroll.prototype.noScrollWindowed = function() {
-  var viewport = remoting.desktopConnectedView.getViewportForTesting();
+  var viewport = getViewportForTesting();
   viewport.setPluginSizeForBumpScrollTesting(
       window.innerWidth + this.kHostDesktopSizeDelta,
       window.innerHeight + this.kHostDesktopSizeDelta);
   this.moveMouseTo(0, 0);
   return this.verifyNoScroll();
 };
 
 /**
  * @return {Promise}
  */
 browserTest.Bump_Scroll.prototype.noScrollSmaller = function() {
-  var viewport = remoting.desktopConnectedView.getViewportForTesting();
+  var viewport = getViewportForTesting();
   viewport.setPluginSizeForBumpScrollTesting(
       window.innerWidth - this.kHostDesktopSizeDelta,
       window.innerHeight - this.kHostDesktopSizeDelta);
   this.moveMouseTo(0, 0);
   return this.verifyNoScroll();
 };
 
 /**
  * @param {number} widthFraction
  * @param {number} heightFraction
  * @return {Promise}
  */
 browserTest.Bump_Scroll.prototype.scrollDirection =
     function(widthFraction, heightFraction) {
-  var viewport = remoting.desktopConnectedView.getViewportForTesting();
+  var viewport = getViewportForTesting();
   viewport.setPluginSizeForBumpScrollTesting(
       screen.width + this.kHostDesktopSizeDelta,
       screen.height + this.kHostDesktopSizeDelta);
   /** @type {number} */
   var expectedTop = heightFraction === 0.0 ? 0 :
                     heightFraction == 1.0 ? -this.kHostDesktopSizeDelta :
                     undefined;
   /** @type {number} */
   var expectedLeft = widthFraction === 0.0 ? 0 :
                      widthFraction === 1.0 ? -this.kHostDesktopSizeDelta :
@@ skipping 111 matching lines @@
  * @param {number|undefined} expectedTop The expected vertical position of the
  *    plugin, or undefined if it is not expected to change.
  * @param {number|undefined} expectedLeft The expected horizontal position of
  *    the plugin, or undefined if it is not expected to change.
  * @param {browserTest.FakeDesktopViewport=} opt_desktopViewport
  *     DesktopViewport fake, for testing.
  * @return {Promise}
  */
 browserTest.Bump_Scroll.prototype.verifyScroll =
     function (expectedTop, expectedLeft, opt_desktopViewport) {
-  var desktopViewport = opt_desktopViewport ||
-      remoting.desktopConnectedView.getViewportForTesting();
+  var desktopViewport = opt_desktopViewport || getViewportForTesting();
   base.debug.assert(desktopViewport != null);
   var STARTED = remoting.BumpScroller.Events.bumpScrollStarted;
   var STOPPED = remoting.BumpScroller.Events.bumpScrollStopped;
 
   var initialPosition = desktopViewport.getPluginPositionForTesting();
   var initialTop = initialPosition.top;
   var initialLeft = initialPosition.left;
 
   /** @return {Promise} */
   var verifyPluginPosition = function() {
@@ skipping 35 matching lines @@
 
 /**
  * @param {browserTest.FakeDesktopViewport=} opt_desktopViewport
  *     DesktopViewport fake, for testing.
  *
  * @return {Promise<boolean>} A promise that resolves to true if no scrolling
  *   occurs within a timeout.
  */
 browserTest.Bump_Scroll.prototype.verifyNoScroll =
     function(opt_desktopViewport) {
-  var desktopViewport = opt_desktopViewport ||
-                        remoting.desktopConnectedView.getViewportForTesting();
+  var desktopViewport = opt_desktopViewport || getViewportForTesting();
   var bumpScroller = desktopViewport.getBumpScrollerForTesting();
   if (!bumpScroller) {
     Promise.resolve(true);
   }
   return this.verifyScroll(undefined, undefined, desktopViewport);
 };