Revert "Chrome OS: Use Chrome logo on the OOBE Sync Sessings screen."

This reverts commit 69f0b0d2.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 532221 as the
culprit for failures in the build cycles as shown on:
https://findit-for-me.appspot.com/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtLzY5ZjBiMGQyMWRjNmEzZDk3YmZhNGNiMDU5MTkzZGI5OWNiMDAwNTEM

Sample Failed Build: https://ci.chromium.org/buildbot/chromium.chrome/Google%20Chrome%20ChromeOS/44876

Original change's description:
> Chrome OS: Use Chrome logo on the OOBE Sync Sessings screen.
> 
> 
> This CL limits Sync settings screen to Google Chrome build and adds Chrome logo
> to it.
> 
> BUG=805507
> 
> Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
> Change-Id: I5d17c32a7b9339af93394b366976d8ae43e13f03
> Reviewed-on: https://chromium-review.googlesource.com/889916
> Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
> Commit-Queue: Alexander Alekseev <alemate@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#532221}

No-Presubmit: true
No-Tree-Checks: true
No-Try: true
BUG=805507
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation

Change-Id: If84b7f7f1159d8e5ee525ef0bf7104f867fb933b
Reviewed-on: https://chromium-review.googlesource.com/890539
Cr-Commit-Position: refs/heads/master@{#532224}

chrome/app/theme/chrome_unscaled_resources.grd

@@ -22,10 +22,6 @@
           <include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" />
           <include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" />
         </if>
-        <if expr="chromeos">
-          <include name="IDR_PRODUCT_LOGO_24PX_1X" file="google_chrome/chrome_24px_1x.svg" type="BINDATA" />
-          <include name="IDR_PRODUCT_LOGO_24PX_2X" file="google_chrome/chrome_24px_2x.svg" type="BINDATA" />
-        </if>
         <if expr="is_win">
           <!-- External company logo, displayed in the Chrome Cleanup WebUI if
                cleanup functionality is powered by an external company. -->

chrome/browser/chromeos/login/wizard_controller.cc

@@ -581,7 +581,6 @@ void WizardController::ShowTermsOfServiceScreen() {
 }
 
 void WizardController::ShowSyncConsentScreen() {
-#if defined(GOOGLE_CHROME_BUILD)
   const user_manager::UserManager* user_manager =
       user_manager::UserManager::Get();
   // Skip for non-regular users.
@@ -595,9 +594,6 @@ void WizardController::ShowSyncConsentScreen() {
   VLOG(1) << "Showing Sync Consent screen.";
   UpdateStatusAreaVisibilityForScreen(OobeScreen::SCREEN_SYNC_CONSENT);
   SetCurrentScreen(GetScreen(OobeScreen::SCREEN_SYNC_CONSENT));
-#else
-  ShowArcTermsOfServiceScreen();
-#endif
 }
 
 void WizardController::ShowArcTermsOfServiceScreen() {

chrome/browser/resources/chromeos/login/sync_consent.html

@@ -53,10 +53,9 @@
       </div>
       <div class="footer layout vertical">
         <div class="overview-list-item flex layout horizontal center">
-          <img srcset="chrome://oobe/logo_24px-1x.svg 1x,
-                       chrome://oobe/logo_24px-2x.svg 2x"
-              class="overview-list-item-icon">
-          </img>
+          <hd-iron-icon class="overview-list-item-icon"
+              icon1x="sync-consent-32:googleg" icon2x="sync-consent-64:googleg">
+          </hd-iron-icon>
           <div class="overview-list-item-text flex layout vertical
               center-justified">
             <div class="overview-list-item-title">

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

@@ -120,11 +120,6 @@ const char kArcPlaystoreJSPath[] = "playstore.js";
 const char kArcPlaystoreLogoPath[] = "playstore.svg";
 const char kProductLogoPath[] = "product-logo.png";
 
-#if defined(GOOGLE_CHROME_BUILD)
-const char kLogo24PX1XSvgPath[] = "logo_24px-1x.svg";
-const char kLogo24PX2XSvgPath[] = "logo_24px-2x.svg";
-#endif
-
 // Creates a WebUIDataSource for chrome://oobe
 content::WebUIDataSource* CreateOobeUIDataSource(
     const base::DictionaryValue& localized_strings,
@@ -182,11 +177,6 @@ content::WebUIDataSource* CreateOobeUIDataSource(
     source->AddResourcePath(kCustomElementsUserPodHTMLPath,
                             IDR_CUSTOM_ELEMENTS_USER_POD_HTML);
   }
-#if defined(GOOGLE_CHROME_BUILD)
-  source->AddResourcePath(kLogo24PX1XSvgPath, IDR_PRODUCT_LOGO_24PX_1X);
-  source->AddResourcePath(kLogo24PX2XSvgPath, IDR_PRODUCT_LOGO_24PX_2X);
-  // No #else section here as Sync Settings screen is Chrome-specific.
-#endif
 
   // Required for postprocessing of Goolge PlayStore Terms.
   source->AddResourcePath(kArcPlaystoreCSSPath, IDR_ARC_SUPPORT_PLAYSTORE_CSS);