Settings: merge two test-sync-browser-proxy implementations

Bug: 815018
Change-Id: I4acef1831cee5f32b6f2b307c5d695e7f3177cb9
Reviewed-on: https://chromium-review.googlesource.com/939180
Commit-Queue: Scott Chen <scottchen@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#539805}

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

@@ -473,6 +473,7 @@ CrSettingsPeoplePageSyncPageTest.prototype = {
   /** @override */
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     '../test_browser_proxy.js',
+    'test_sync_browser_proxy.js',
     'people_page_sync_page_test.js',
   ]),
 };

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

@@ -3,42 +3,6 @@
 // found in the LICENSE file.
 
 cr.define('settings_people_page_sync_page', function() {
-  /** @implements {settings.SyncBrowserProxy} */
-  class TestSyncBrowserProxy extends TestBrowserProxy {
-    constructor() {
-      super([
-        'didNavigateToSyncPage',
-        'didNavigateAwayFromSyncPage',
-        'setSyncDatatypes',
-        'setSyncEncryption',
-      ]);
-
-      /* @type {!settings.PageStatus} */
-      this.encryptionResponse = settings.PageStatus.CONFIGURE;
-    }
-
-    /** @override */
-    didNavigateToSyncPage() {
-      this.methodCalled('didNavigateToSyncPage');
-    }
-
-    /** @override */
-    didNavigateAwayFromSyncPage() {
-      this.methodCalled('didNavigateAwayFromSyncPage');
-    }
-
-    /** @override */
-    setSyncDatatypes(syncPrefs) {
-      this.methodCalled('setSyncDatatypes', syncPrefs);
-      return Promise.resolve(settings.PageStatus.CONFIGURE);
-    }
-
-    /** @override */
-    setSyncEncryption(syncPrefs) {
-      this.methodCalled('setSyncEncryption', syncPrefs);
-      return Promise.resolve(this.encryptionResponse);
-    }
-  }
 
   suite('AdvancedSyncSettingsTests', function() {
     let syncPage = null;

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

@@ -6,17 +6,24 @@
 class TestSyncBrowserProxy extends TestBrowserProxy {
   constructor() {
     super([
-      'getSyncStatus',
+      'didNavigateAwayFromSyncPage',
+      'didNavigateToSyncPage',
+      'getPromoImpressionCount',
       'getStoredAccounts',
+      'getSyncStatus',
+      'incrementPromoImpressionCount',
+      'setSyncDatatypes',
+      'setSyncEncryption',
       'signOut',
       'startSignIn',
       'startSyncingWithEmail',
-      'getPromoImpressionCount',
-      'incrementPromoImpressionCount',
     ]);
 
     /** @private {number} */
     this.impressionCount_ = 0;
+
+    /** @type {!settings.PageStatus} */
+    this.encryptionResponse = settings.PageStatus.CONFIGURE;
   }
 
   /** @override */
@@ -63,4 +70,26 @@ class TestSyncBrowserProxy extends TestBrowserProxy {
   incrementPromoImpressionCount() {
     this.methodCalled('incrementPromoImpressionCount');
   }
+
+  /** @override */
+  didNavigateToSyncPage() {
+    this.methodCalled('didNavigateToSyncPage');
+  }
+
+  /** @override */
+  didNavigateAwayFromSyncPage() {
+    this.methodCalled('didNavigateAwayFromSyncPage');
+  }
+
+  /** @override */
+  setSyncDatatypes(syncPrefs) {
+    this.methodCalled('setSyncDatatypes', syncPrefs);
+    return Promise.resolve(settings.PageStatus.CONFIGURE);
+  }
+
+  /** @override */
+  setSyncEncryption(syncPrefs) {
+    this.methodCalled('setSyncEncryption', syncPrefs);
+    return Promise.resolve(this.encryptionResponse);
+  }
 }
\ No newline at end of file