Add setting to isolate zoom changes by default.

chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js

Index: chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js
diff --git a/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js b/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js
index dd9abed76a8fa03899e486cbb22933541f303d73..80ae5abea7842d2016624495ce5bb458b6846c99 100644
--- a/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js
+++ b/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js
@@ -50,6 +50,7 @@ var TestSiteSettingsPrefsBrowserProxy = function() {
   settings.TestBrowserProxy.call(this, [
     'fetchUsbDevices',
     'fetchZoomLevels',
+    'fetchZoomScope',
     'getCookieDetails',
     'getDefaultValueForContentType',
     'getExceptionList',
@@ -63,12 +64,16 @@ var TestSiteSettingsPrefsBrowserProxy = function() {
     'resetCategoryPermissionForOrigin',
     'setCategoryPermissionForOrigin',
     'setDefaultValueForContentType',
-    'setProtocolDefault'
+    'setProtocolDefault',
+    'setZoomScopeIsPerOrigin',
   ]);
 
   /** @private {!SiteSettingsPref} */
   this.prefs_ = prefsEmpty;
 
+  /** @private {boolean} */
+  this.zoomScopeIsPerOrigin_ = true;
+
   /** @private {!Array<ZoomLevelEntry>} */
   this.zoomList_ = [];
 
@@ -103,6 +108,14 @@ TestSiteSettingsPrefsBrowserProxy.prototype = {
 
   /**
    * Sets the prefs to use when testing.
+   * @param {boolean} zoomScopeIsPerOrigin The zoom scope to set.
+   */
+  setZoomScope: function(zoomScopeIsPerOrigin) {
+    this.zoomScopeIsPerOrigin_ = zoomScopeIsPerOrigin;
+  },
+
+  /**
+   * Sets the prefs to use when testing.
    * @param {!Array<ZoomLevelEntry>} list The zoom list to set.
    */
   setZoomList: function(list) {
@@ -247,6 +260,12 @@ TestSiteSettingsPrefsBrowserProxy.prototype = {
   },
 
   /** @override */
+  fetchZoomScope: function() {
+    cr.webUIListenerCallback('onZoomScopeChanged', this.zoomScopeIsPerOrigin_);
+    this.methodCalled('fetchZoomScope');
+  },
+
+  /** @override */
   fetchZoomLevels: function() {
     cr.webUIListenerCallback('onZoomLevelsChanged', this.zoomList_);
     this.methodCalled('fetchZoomLevels');
@@ -263,6 +282,11 @@ TestSiteSettingsPrefsBrowserProxy.prototype = {
   },
 
   /** @override */
+  setZoomScopeIsPerOrigin: function(zoomScopeIsPerOrigin) {
+    this.methodCalled('setZoomScopeIsPerOrigin', [zoomScopeIsPerOrigin]);
+  },
+
+  /** @override */
   removeZoomLevel: function(host) {
     this.methodCalled('removeZoomLevel', [host]);
   },