Remove Kaleidoscope NTP module

Kaleidoscope has been turned down.

Change-Id: I030fce11f17591b9f02cc9352f53431f5eaaafdf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2596020
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840254}

chrome/browser/chrome_browser_interface_binders.cc

@@ -820,11 +820,7 @@ void PopulateChromeWebUIFrameBinders(
                                          KaleidoscopeUI>(map);
 
   RegisterWebUIControllerInterfaceBinder<
-      media::mojom::KaleidoscopeNTPDataProvider, NewTabPageUI>(map);
-
-  RegisterWebUIControllerInterfaceBinder<
-      media::mojom::KaleidoscopeIdentityManager, KaleidoscopeUI, NewTabPageUI>(
-      map);
+      media::mojom::KaleidoscopeIdentityManager, KaleidoscopeUI>(map);
 #endif  // !defined(OS_ANDROID)
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)

chrome/browser/resources/new_tab_page/BUILD.gn

@@ -13,7 +13,8 @@ import("//ui/webui/webui_features.gni")
 
 js_type_check("closure_compile") {
   is_polymer3 = true
-  closure_flags = default_closure_args + mojom_js_args + [ "browser_resolver_prefix_replacements=\"chrome://kaleidoscope/=../../chrome/browser/media/kaleidoscope/internal/resources\"" ]
+
+  closure_flags = default_closure_args + mojom_js_args
 
   deps = [
     ":app",
@@ -59,7 +60,6 @@ js_library("lazy_load") {
     ":most_visited",
     ":voice_search_overlay",
     "modules/dummy:module",
-    "modules/kaleidoscope:module",
   ]
 }
 

chrome/browser/resources/new_tab_page/modules/BUILD.gn

@@ -18,7 +18,6 @@ js_library("modules") {
     ":module_registry",
     "cart:module",
     "drive:module",
-    "kaleidoscope:module",
     "task_module:module",
   ]
   if (!is_official_build) {
@@ -59,7 +58,6 @@ group("web_components") {
     "cart:web_components",
     "drive:web_components",
     "dummy:web_components",
-    "kaleidoscope:web_components",
     "task_module:web_components",
   ]
 }
@@ -109,7 +107,6 @@ preprocess_if_expr("preprocess_gen") {
   out_folder = "$target_gen_dir/$preprocess_folder"
   out_manifest = "$target_gen_dir/$preprocess_gen_manifest"
   in_files = [
-    "kaleidoscope/module.js",
     "module_header.js",
     "module_wrapper.js",
     "task_module/module.js",

chrome/browser/resources/new_tab_page/modules/kaleidoscope/BUILD.gn

-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//chrome/browser/buildflags.gni")
-import("//third_party/closure_compiler/compile_js.gni")
-
-# TODO(crbug.com/1152230): Upstream the Kaleidoscope module code and remove the
-# fallback module.
-# TODO(tiborg): Make this if(enable_kaleidoscope) once downstream changes have
-# landed.
-if (false) {
-  group("module") {
-    public_deps =
-        [ "//chrome/browser/media/kaleidoscope/internal/resources/module" ]
-  }
-
-  copy("web_components") {
-    sources = [ "$root_gen_dir/chrome/browser/media/kaleidoscope/internal/resources/module/module.js" ]
-    outputs = [ "$target_gen_dir/module.js" ]
-    deps = [ "//chrome/browser/media/kaleidoscope/internal/resources/module:web_components" ]
-  }
-} else {
-  js_library("module") {
-    deps = [ "..:module_descriptor" ]
-    externs_list = [ "externs.js" ]
-  }
-
-  copy("web_components") {
-    sources = [ "module.js" ]
-    outputs = [ "$target_gen_dir/module.js" ]
-    deps = [ ":module" ]
-  }
-}

chrome/browser/resources/new_tab_page/modules/kaleidoscope/DIR_METADATA

-monorail:  {
-  component:  "Internals>Media>UI>Kaleidoscope"
-}

chrome/browser/resources/new_tab_page/modules/kaleidoscope/OWNERS

-file://chrome/browser/media/kaleidoscope/OWNERS

chrome/browser/resources/new_tab_page/modules/kaleidoscope/externs.js

-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/**
- * @returns {Promise<?HTMLElement>}
- */
-window.loadKaleidoscopeModule = () => {};

chrome/browser/resources/new_tab_page/modules/kaleidoscope/module.js

-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import {ModuleDescriptor} from '../module_descriptor.js';
-
-/** @type {!ModuleDescriptor} */
-export const kaleidoscopeDescriptor = new ModuleDescriptor(
-    /*id=*/ 'kaleidoscope',
-    /*heightPx=*/ 384,
-    async () => null,
-);

chrome/browser/resources/new_tab_page/modules/modules.js

@@ -13,7 +13,6 @@ import {driveDescriptor} from './drive/module.js';
 // <if expr="not is_official_build">
 import {dummyDescriptor, dummyDescriptor2} from './dummy/module.js';
 // </if>
-import {kaleidoscopeDescriptor} from './kaleidoscope/module.js';
 import {ModuleDescriptor} from './module_descriptor.js';
 import {ModuleRegistry} from './module_registry.js';
 import {recipeTasksDescriptor, shoppingTasksDescriptor} from './task_module/module.js';
@@ -29,10 +28,6 @@ if (loadTimeData.getBoolean('recipeTasksModuleEnabled')) {
   descriptors.push(recipeTasksDescriptor);
 }
 
-if (loadTimeData.getBoolean('kaleidoscopeModuleEnabled')) {
-  descriptors.push(kaleidoscopeDescriptor);
-}
-
 if (loadTimeData.getBoolean('chromeCartModuleEnabled')) {
   descriptors.push(chromeCartDescriptor);
 }

chrome/browser/resources/new_tab_page/new_tab_page.js

@@ -23,7 +23,6 @@ export {FooProxy} from './modules/dummy/foo_proxy.js';
 export {dummyDescriptor} from './modules/dummy/module.js';
 // </if>
 export {driveDescriptor} from './modules/drive/module.js';
-export {kaleidoscopeDescriptor} from './modules/kaleidoscope/module.js';
 export {ModuleDescriptor} from './modules/module_descriptor.js';
 export {ModuleRegistry} from './modules/module_registry.js';
 export {recipeTasksDescriptor, shoppingTasksDescriptor} from './modules/task_module/module.js';

chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc

@@ -9,10 +9,6 @@
 
 #include "chrome/browser/buildflags.h"
 #include "chrome/browser/cart/cart_handler.h"
-#include "chrome/browser/media/kaleidoscope/constants.h"
-#include "chrome/browser/media/kaleidoscope/kaleidoscope_data_provider_impl.h"
-#include "chrome/browser/media/kaleidoscope/kaleidoscope_identity_manager_impl.h"
-#include "chrome/browser/media/kaleidoscope/kaleidoscope_ui.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
@@ -242,12 +238,6 @@ content::WebUIDataSource* CreateNewTabPageUiHtmlSource(Profile* profile) {
       {omnibox::kTrendingUpIconResourceName, IDR_LOCAL_NTP_ICONS_TRENDING_UP}};
   webui::AddResourcePathsBulk(source, kImages);
 
-#if BUILDFLAG(ENABLE_KALEIDOSCOPE)
-  source->AddBoolean("kaleidoscopeModuleEnabled",
-                     base::FeatureList::IsEnabled(media::kKaleidoscopeModule));
-#else
-  source->AddBoolean("kaleidoscopeModuleEnabled", false);
-#endif  // BUILDFLAG(ENABLE_KALEIDOSCOPE)
   source->AddBoolean(
       "recipeTasksModuleEnabled",
       base::FeatureList::IsEnabled(ntp_features::kNtpRecipeTasksModule));
@@ -271,17 +261,15 @@ content::WebUIDataSource* CreateNewTabPageUiHtmlSource(Profile* profile) {
   // script-src.
   source->OverrideContentSecurityPolicy(
       network::mojom::CSPDirectiveName::ScriptSrc,
-      "script-src chrome://resources chrome://test chrome://kaleidoscope "
+      "script-src chrome://resources chrome://test "
       "'self' 'unsafe-inline' https:;");
   // Allow embedding of iframes from the One Google Bar and
-  // chrome-untrusted://new-tab-page for other external content and resources
-  // and chrome-untrusted://kaleidoscope for Kaleidoscope.
+  // chrome-untrusted://new-tab-page for other external content and resources.
   source->OverrideContentSecurityPolicy(
       network::mojom::CSPDirectiveName::ChildSrc,
-      base::StringPrintf("child-src https: %s %s %s;",
+      base::StringPrintf("child-src https: %s %s;",
                          google_util::CommandLineGoogleBaseURL().spec().c_str(),
-                         chrome::kChromeUIUntrustedNewTabPageUrl,
-                         kKaleidoscopeUntrustedContentUIURL));
+                         chrome::kChromeUIUntrustedNewTabPageUrl));
 
   return source;
 }
@@ -319,12 +307,6 @@ NewTabPageUI::NewTabPageUI(content::WebUI* web_ui)
       profile_,
       std::make_unique<ThemeSource>(profile_, /*serve_untrusted=*/true));
 
-  content::WebUIDataSource::Add(profile_,
-                                KaleidoscopeUI::CreateWebUIDataSource());
-
-  content::WebUIDataSource::Add(
-      profile_, KaleidoscopeUI::CreateUntrustedWebUIDataSource());
-
   web_ui->AddRequestableScheme(content::kChromeUIUntrustedScheme);
 
   instant_service_->AddObserver(this);
@@ -369,21 +351,6 @@ void NewTabPageUI::BindInterface(
   customize_themes_factory_receiver_.Bind(std::move(pending_receiver));
 }
 
-void NewTabPageUI::BindInterface(
-    mojo::PendingReceiver<media::mojom::KaleidoscopeNTPDataProvider>
-        pending_page_handler) {
-  kaleidoscope_data_provider_ = std::make_unique<KaleidoscopeDataProviderImpl>(
-      std::move(pending_page_handler), profile_, nullptr);
-}
-
-void NewTabPageUI::BindInterface(
-    mojo::PendingReceiver<media::mojom::KaleidoscopeIdentityManager>
-        pending_page_handler) {
-  kaleidoscope_identity_manager_ =
-      std::make_unique<KaleidoscopeIdentityManagerImpl>(
-          std::move(pending_page_handler), profile_);
-}
-
 void NewTabPageUI::BindInterface(
     mojo::PendingReceiver<task_module::mojom::TaskModuleHandler>
         pending_receiver) {

chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h

@@ -7,7 +7,6 @@
 
 #include "base/macros.h"
 #include "chrome/browser/cart/chrome_cart.mojom.h"
-#include "chrome/browser/media/kaleidoscope/mojom/kaleidoscope.mojom.h"
 #include "chrome/browser/promo_browser_command/promo_browser_command.mojom-forward.h"
 #include "chrome/browser/search/instant_service_observer.h"
 #include "chrome/browser/search/task_module/task_module.mojom.h"
@@ -34,8 +33,6 @@ class FooHandler;
 #endif
 class GURL;
 class InstantService;
-class KaleidoscopeDataProviderImpl;
-class KaleidoscopeIdentityManagerImpl;
 class NewTabPageHandler;
 class Profile;
 class PromoBrowserCommandHandler;
@@ -74,20 +71,6 @@ class NewTabPageUI
                      customize_themes::mojom::CustomizeThemesHandlerFactory>
                          pending_receiver);
 
-  // Instantiates the implementor of the
-  // media::mojom::KaleidoscopeNTPDataProvider mojo interface passing the
-  // pending receiver that will be internally bound.
-  void BindInterface(
-      mojo::PendingReceiver<media::mojom::KaleidoscopeNTPDataProvider>
-          pending_receiver);
-
-  // Instantiates the implementor of the
-  // media::mojom::KaleidoscopeIdentityManager mojo interface passing the
-  // pending receiver that will be internally bound.
-  void BindInterface(
-      mojo::PendingReceiver<media::mojom::KaleidoscopeIdentityManager>
-          pending_receiver);
-
   // Instantiates the implementor of the
   // shopping_tasks::mojom::ShoppingTasksHandler mojo interface passing the
   // pending receiver that will be internally bound.
@@ -153,9 +136,6 @@ class NewTabPageUI
   base::Time navigation_start_time_;
 
   // Mojo implementations for modules:
-  std::unique_ptr<KaleidoscopeDataProviderImpl> kaleidoscope_data_provider_;
-  std::unique_ptr<KaleidoscopeIdentityManagerImpl>
-      kaleidoscope_identity_manager_;
   std::unique_ptr<TaskModuleHandler> task_module_handler_;
 
   WEB_UI_CONTROLLER_TYPE_DECL();

tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml

@@ -11156,7 +11156,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="drive" label="Module ID for Google Drive module"/>
   <suffix name="dummy" label="Module ID for a dummy module"/>
   <suffix name="dummy2" label="Module ID for another dummy module"/>
-  <suffix name="kaleidoscope" label="Module ID for Kaleidoscope"/>
+  <suffix name="kaleidoscope" label="Module ID for Kaleidoscope">
+    <obsolete>
+      Kaleidoscope has been turned down.
+    </obsolete>
+  </suffix>
   <suffix name="recipe_tasks" label="Module ID for Recipe Tasks"/>
   <suffix name="shopping_tasks" label="Module ID for Shopping Tasks"/>
   <affected-histogram name="NewTabPage.Modules.Dismissed"/>