Settings: Move sync-account-control to main module

This UI is shown on the main people page landing page, so to avoid
flicker on load, it should be in the main rather than the lazy module.

Size changes:
vulcanized.html: 240k -> 247k (+2.9%)
crisper.js: 313k -> 321k (+2.6%)

lazy_load.vulcanized.html: 257k -> 249k (-3.1%)
lazy_load.crisper.js: 304k -> 297k (-2.3%)

Bug: 1026064
Change-Id: I809b8701ab3859561911980064bd84a4ded4a83f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2134779
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756443}

chrome/browser/resources/settings/lazy_load.html

@@ -30,7 +30,6 @@
   <link rel="import" href="people_page/manage_profile.html">
 </if>
   <link rel="import" href="people_page/signout_dialog.html">
-  <link rel="import" href="people_page/sync_account_control.html">
   <link rel="import" href="people_page/sync_controls.html">
   <link rel="import" href="people_page/sync_page.html">
 

chrome/browser/resources/settings/lazy_load.js

@@ -98,7 +98,6 @@ export {SetPINDialogPage} from './privacy_page/security_keys_set_pin_dialog.m.js
 export {CredentialManagementDialogPage} from './privacy_page/security_keys_credential_management_dialog.m.js';
 export {BioEnrollDialogPage} from './privacy_page/security_keys_bio_enroll_dialog.m.js';
 export {WebsiteUsageBrowserProxyImpl} from './site_settings/website_usage_browser_proxy.m.js';
-export {MAX_SIGNIN_PROMO_IMPRESSION} from './people_page/sync_account_control.m.js';
 
 // <if expr="not chromeos">
 export {SystemPageBrowserProxyImpl} from './system_page/system_page_browser_proxy.m.js';

chrome/browser/resources/settings/people_page/people_page.html

@@ -17,6 +17,7 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
 <link rel="import" href="../controls/settings_toggle_button.html">
 <link rel="import" href="profile_info_browser_proxy.html">
+<link rel="import" href="sync_account_control.html">
 <link rel="import" href="sync_browser_proxy.html">
 <link rel="import" href="../i18n_setup.html">
 <link rel="import" href="../icons.html">

chrome/browser/resources/settings/settings.js

@@ -50,6 +50,7 @@ export {OnStartupBrowserProxy, OnStartupBrowserProxyImpl} from './on_startup_pag
 export {EDIT_STARTUP_URL_EVENT} from './on_startup_page/startup_url_entry.m.js';
 export {StartupUrlsPageBrowserProxy, StartupUrlsPageBrowserProxyImpl} from './on_startup_page/startup_urls_page_browser_proxy.m.js';
 export {OpenWindowProxyImpl} from './open_window_proxy.m.js';
+export {MAX_SIGNIN_PROMO_IMPRESSION} from './people_page/sync_account_control.m.js';
 export {PageStatus, StatusAction, SyncBrowserProxyImpl} from './people_page/sync_browser_proxy.m.js';
 export {ProfileInfoBrowserProxyImpl} from './people_page/profile_info_browser_proxy.m.js';
 export {pageVisibility, setPageVisibilityForTesting} from './page_visibility.m.js';

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

@@ -3,8 +3,7 @@
 // found in the LICENSE file.
 
 // clang-format off
-// #import {Router, routes, SyncBrowserProxyImpl, StatusAction} from 'chrome://settings/settings.js';
-// #import {MAX_SIGNIN_PROMO_IMPRESSION} from 'chrome://settings/lazy_load.js';
+// #import {MAX_SIGNIN_PROMO_IMPRESSION, Router, routes, SyncBrowserProxyImpl, StatusAction} from 'chrome://settings/settings.js';
 // #import {TestSyncBrowserProxy} from 'chrome://test/settings/test_sync_browser_proxy.m.js';
 // #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 // #import {isChromeOS} from 'chrome://resources/js/cr.m.js';