Refactor sinon helper to make it easier to use.

remoting/webapp/unittests/base_unittest.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.
 
 (function() {
 
 'use strict';
 
 module('base');
 
 test('mix(dest, src) should copy properties from |src| to |dest|',
   function() {
     var src = { a: 'a', b: 'b'};
     var dest = { c: 'c'};
 
     base.mix(dest, src);
     deepEqual(dest, {a: 'a', b: 'b', c: 'c'});
 });
 
 test('mix(dest, src) should assert if properties are overwritten',
   function() {
     var src = { a: 'a', b: 'b'};
     var dest = { a: 'a'};
 
-    sinon.$setupStub(base.debug, 'assert');
+    sinon.stub(base.debug, 'assert');
 
     try {
       base.mix(dest, src);
     } catch (e) {
     } finally {
       sinon.assert.called(base.debug.assert);
-      base.debug.assert.$testStub.restore();
+      $testStub(base.debug.assert).restore();
     }
 });
 
 test('values(obj) should return an array containing the values of |obj|',
   function() {
     var output = base.values({ a: 'a', b: 'b'});
 
     notEqual(output.indexOf('a'), -1, '"a" should be in the output');
     notEqual(output.indexOf('b'), -1, '"b" should be in the output');
 });
@@ skipping 194 matching lines @@
 });
 
 test('raiseEvent() should not invoke listeners of a different event',
   function() {
     source.raiseEvent('bar');
     sinon.assert.notCalled(listener);
 });
 
 test('raiseEvent() should assert when undeclared events are raised',
   function() {
-    sinon.$setupStub(base.debug, 'assert');
+    sinon.stub(base.debug, 'assert');
     try {
       source.raiseEvent('undefined');
     } catch (e) {
     } finally {
       sinon.assert.called(base.debug.assert);
-      base.debug.assert.$testStub.restore();
+      $testStub(base.debug.assert).restore();
     }
 });
 
 test(
   'removeEventListener() should not invoke the listener in subsequent ' +
   'calls to |raiseEvent|',
   function() {
     source.raiseEvent('foo');
     sinon.assert.calledOnce(listener);
 
@@ skipping 54 matching lines @@
                           /* Ѓ */ 0xD0, 0x83,
                           /* ф */ 0xD1, 0x84]).buffer),
       "挂Ѓф");
 
   // Unicode surrogate pair for U+1F603.
   QUnit.equal(base.decodeUtf8(new Uint8Array([0xF0, 0x9F, 0x98, 0x83]).buffer),
               "😃");
 });
 
 })();