Protect intent config resource with KIOSK_NEXT.

Bug: 959076
Change-Id: I5e9c7e34c016f6496d34db2b8e669653f50860c5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1594113Reviewed-by: Lucas Tenório <ltenorio@chromium.org>
Commit-Queue: Bruno Santos <brunoad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#656408}

chrome/browser/chromeos/BUILD.gn

@@ -45,11 +45,6 @@ source_set("chromeos") {
     "//ui/strings",
   ]
 
-  if (enable_kiosk_next && is_chrome_branded) {
-    public_deps +=
-        [ "//chrome/browser/resources:kiosk_next_internal_resources" ]
-  }
-
   deps = [
     ":attestation_proto",
     ":backdrop_wallpaper_proto",
@@ -2093,8 +2088,16 @@ source_set("chromeos") {
     ]
   }
 
+  defines = []
   if (use_cras) {
-    defines = [ "USE_CRAS" ]
+    defines += [ "USE_CRAS" ]
+  }
+  if (enable_kiosk_next) {
+    defines += [ "KIOSK_NEXT" ]
+    if (is_chrome_branded) {
+      public_deps +=
+          [ "//chrome/browser/resources:kiosk_next_internal_resources" ]
+    }
   }
 }
 

chrome/browser/chromeos/kiosk_next_home/intent_config_helper.cc

@@ -18,7 +18,7 @@
 #include "services/data_decoder/public/cpp/safe_json_parser.h"
 #include "url/url_constants.h"
 
-#if defined(GOOGLE_CHROME_BUILD)
+#if defined(KIOSK_NEXT) && defined(GOOGLE_CHROME_BUILD)
 #include "chrome/grit/kiosk_next_internal_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #endif
@@ -59,7 +59,7 @@ class ReadJsonConfigResourceDelegate : public IntentConfigHelper::Delegate {
 
   // IntentConfigHelper::Delegate:
   std::string GetJsonConfig() const override {
-#if defined(GOOGLE_CHROME_BUILD)
+#if defined(KIOSK_NEXT) && defined(GOOGLE_CHROME_BUILD)
     return ui::ResourceBundle::GetSharedInstance()
         .GetRawDataResource(IDR_KIOSK_NEXT_INTENT_CONFIG_JSON)
         .as_string();