arc: Use static Assitant logo in OOBE.

This replaces external reference of Assistant logo in OOBE OptIn to
internal static icon.

Test: Manually
Bug: 828642
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I9d0c42acf53095af14c31fc1d64ab5f4731a9509
Reviewed-on: https://chromium-review.googlesource.com/994732Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Yury Khmel <khmel@google.com>
Cr-Commit-Position: refs/heads/master@{#548103}

chrome/browser/browser_resources.grd

@@ -652,6 +652,9 @@
         <include name="IDR_SYS_INTERNALS_IMAGE_MEMORY_SVG" file="resources\chromeos\sys_internals\img\memory.svg" type="BINDATA" />
         <include name="IDR_SYS_INTERNALS_IMAGE_ZRAM_SVG" file="resources\chromeos\sys_internals\img\zram.svg" type="BINDATA" />
       </if>
+      <if expr="chromeos">
+        <include name="IDR_ASSISTANT_LOGO_PNG" file="resources\chromeos\assistant_optin\assistant_logo.png" type="BINDATA" />
+      </if>
     </includes>
   </release>
 </grit>

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

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="oobe_wait_for_container_ready.css">
     <oobe-dialog id="waitForContainerReadyDialog" role="dialog" hide-shadow
         no-footer android>
-      <iron-icon src="https://www.gstatic.com/opa-chromeos/oobe/images/assistant_logo.png"
+      <iron-icon src="chrome://oobe/assistant_logo.png"
         i18n-values="aria-label:voiceInteractionLogo" class="oobe-icon">
       </iron-icon>
       <div class="header">

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

@@ -114,6 +114,7 @@ const char kCustomElementsUserPodHTMLPath[] = "custom_elements_user_pod.html";
 const char kEnrollmentHTMLPath[] = "enrollment.html";
 const char kEnrollmentCSSPath[] = "enrollment.css";
 const char kEnrollmentJSPath[] = "enrollment.js";
+const char kArcAssistantLogoPath[] = "assistant_logo.png";
 const char kArcPlaystoreCSSPath[] = "playstore.css";
 const char kArcPlaystoreJSPath[] = "playstore.js";
 const char kArcPlaystoreLogoPath[] = "playstore.svg";
@@ -174,6 +175,9 @@ content::WebUIDataSource* CreateOobeUIDataSource(
   source->AddResourcePath(kArcPlaystoreLogoPath,
       IDR_ARC_SUPPORT_PLAYSTORE_LOGO);
 
+  // Required for Assistant OOBE.
+  source->AddResourcePath(kArcAssistantLogoPath, IDR_ASSISTANT_LOGO_PNG);
+
   // Required in encryption migration screen.
   source->AddResourcePath(kProductLogoPath, IDR_PRODUCT_LOGO_64);