Tab Search: WebUI source migration

Tab search WebUI source migration effort. Will be followed by a CL that
removes tab_search references from src-internal/DEPS and another CL to
rename the tab_search_merge references back to tab_search.

Bug: 1134167
Change-Id: I4d44201b651b60c13125ffaffece668ce66df28e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2492544Reviewed-by: Thomas Lukaszewicz <tluk@chromium.org>
Reviewed-by: Yuheng Huang <yuhengh@chromium.org>
Reviewed-by: John Lee <johntlee@chromium.org>
Commit-Queue: Roman Arora <romanarora@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820389}

chrome/browser/resources/BUILD.gn

@@ -76,7 +76,7 @@ if (enable_js_type_check) {
       deps += [ "about_nacl:closure_compile" ]
     }
     if (enable_tab_search) {
-      deps += [ "tab_search:closure_compile" ]
+      deps += [ "tab_search_merge:closure_compile" ]
     }
     if (enable_webui_tab_strip) {
       deps += [ "tab_strip:closure_compile" ]
@@ -634,9 +634,9 @@ if (enable_tab_search) {
       "-E",
       "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
     ]
-    source = "tab_search/tab_search_resources.grd"
+    source = "tab_search_merge/tab_search_resources.grd"
     deps = [
-      "//chrome/browser/resources/tab_search:web_components",
+      "//chrome/browser/resources/tab_search_merge:web_components",
       "//chrome/browser/ui/webui/tab_search:mojo_bindings_js",
     ]
     defines = chrome_grit_defines

chrome/browser/resources/tab_search_merge/tab_search_resources.grd

@@ -13,7 +13,7 @@
   <release seq="1">
     <includes>
       <include name="IDR_APP_JS"
-               file="${root_gen_dir}/chrome/browser/resources/tab_search/app.js"
+               file="${root_gen_dir}/chrome/browser/resources/tab_search_merge/app.js"
                type="BINDATA"
                use_base_dir="false" />
       <include name="IDR_FUSE_JS"
@@ -29,7 +29,7 @@
                file="tab_search_api_proxy.js"
                type="BINDATA" />
       <include name="IDR_TAB_SEARCH_ITEM_JS"
-               file="${root_gen_dir}/chrome/browser/resources/tab_search/tab_search_item.js"
+               file="${root_gen_dir}/chrome/browser/resources/tab_search_merge/tab_search_item.js"
                type="BINDATA"
                use_base_dir="false"/>
       <include name="IDR_TAB_SEARCH_MOJO_LITE_JS"
@@ -40,7 +40,7 @@
                file="tab_search_page.html"
                type="BINDATA" />
       <include name="IDR_TAB_SEARCH_SEARCH_FIELD_JS"
-               file="${root_gen_dir}/chrome/browser/resources/tab_search/tab_search_search_field.js"
+               file="${root_gen_dir}/chrome/browser/resources/tab_search_merge/tab_search_search_field.js"
                type="BINDATA"
                use_base_dir="false" />
     </includes>

chrome/browser/ui/webui/tab_search/tab_search_ui.cc

@@ -28,7 +28,7 @@
 #if BUILDFLAG(ENABLE_TAB_SEARCH)
 namespace {
 constexpr char kGeneratedPath[] =
-    "@out_folder@/gen/chrome/browser/resources/tab_search/";
+    "@out_folder@/gen/chrome/browser/resources/tab_search_merge/";
 }
 #endif  // BUILDFLAG(ENABLE_TAB_SEARCH)
 

chrome/test/data/webui/BUILD.gn

@@ -29,7 +29,7 @@ if (include_js_tests) {
     ]
 
     if (enable_tab_search) {
-      sources += [ "tab_search/test/tab_search_interactive_ui_tests.js" ]
+      sources += [ "tab_search_merge/tab_search_interactive_ui_tests.js" ]
     }
 
     gen_include_files = [
@@ -180,7 +180,7 @@ if (include_js_tests) {
       sources += [ "print_preview/print_preview_ui_browsertest.js" ]
     }
     if (enable_tab_search) {
-      sources += [ "tab_search/test/tab_search_browsertest.js" ]
+      sources += [ "tab_search_merge/tab_search_browsertest.js" ]
     }
     if (enable_webui_tab_strip) {
       sources += [ "tab_strip/tab_strip_browsertest.js" ]
@@ -502,7 +502,7 @@ group("closure_compile") {
     ]
   }
   if (enable_tab_search) {
-    deps += [ "tab_search/test:closure_compile" ]
+    deps += [ "tab_search_merge:closure_compile" ]
   }
 }
 

chrome/browser/resources/tab_search_merge/test/BUILD.gn → chrome/test/data/webui/tab_search_merge/BUILD.gn

@@ -7,7 +7,7 @@ import("//third_party/closure_compiler/compile_js.gni")
 js_type_check("closure_compile") {
   is_polymer3 = true
   closure_flags = default_closure_args + [
-                    "browser_resolver_prefix_replacements=\"chrome://tab-search/=../../chrome/browser/resources/tab-search/\"",
+                    "browser_resolver_prefix_replacements=\"chrome://tab-search/=../../chrome/browser/resources/tab-search-merge/\"",
                     "js_module_root=../../chrome/test/data/webui/",
                     "js_module_root=./gen/chrome/test/data/webui/",
                   ]
@@ -22,7 +22,7 @@ js_type_check("closure_compile") {
 js_library("fuzzy_search_test") {
   deps = [
     ":test_tab_search_api_proxy",
-    "../..:chai_assert",
+    "..:chai_assert",
   ]
   externs_list = [ "$externs_path/mocha-2.5.js" ]
 }
@@ -30,8 +30,8 @@ js_library("fuzzy_search_test") {
 js_library("tab_search_app_test") {
   deps = [
     ":test_tab_search_api_proxy",
-    "../..:chai_assert",
-    "//chrome/browser/resources/tab_search:app",
+    "..:chai_assert",
+    "//chrome/browser/resources/tab_search_merge:app",
   ]
   externs_list = [ "$externs_path/mocha-2.5.js" ]
 }
@@ -39,24 +39,24 @@ js_library("tab_search_app_test") {
 js_library("tab_search_app_focus_test") {
   deps = [
     ":test_tab_search_api_proxy",
-    "../..:chai_assert",
-    "//chrome/browser/resources/tab_search:app",
+    "..:chai_assert",
+    "//chrome/browser/resources/tab_search_merge:app",
   ]
   externs_list = [ "$externs_path/mocha-2.5.js" ]
 }
 
 js_library("test_tab_search_api_proxy") {
   deps = [
-    "//chrome/browser/resources/tab_search:tab_search_api_proxy",
+    "..:test_browser_proxy.m",
+    "//chrome/browser/resources/tab_search_merge:tab_search_api_proxy",
     "//chrome/browser/ui/webui/tab_search:mojo_bindings_js_library_for_compile",
-    "//chrome/test/data/webui:test_browser_proxy.m",
   ]
 }
 
 js_library("tab_search_item_test") {
   deps = [
-    "../..:chai_assert",
-    "//chrome/browser/resources/tab_search:tab_search_item",
+    "..:chai_assert",
+    "//chrome/browser/resources/tab_search_merge:tab_search_item",
   ]
   externs_list = [ "$externs_path/mocha-2.5.js" ]
 }

chrome/browser/resources/tab_search_merge/test/fuzzy_search_test.js → chrome/test/data/webui/tab_search_merge/fuzzy_search_test.js

@@ -176,8 +176,8 @@ suite('FuzzySearchTest', () => {
     assertDeepEquals(records, fuzzySearch('', records, options));
 
     assertDeepEquals(archMatchedRecords, fuzzySearch('arch', records, options));
-    assertDeepEquals(searchMatchedRecords,
-                     fuzzySearch('search', records, options));
+    assertDeepEquals(
+        searchMatchedRecords, fuzzySearch('search', records, options));
 
     // No matches should return an empty list.
     assertDeepEquals([], fuzzySearch('archh', records, options));
@@ -214,10 +214,10 @@ suite('FuzzySearchTest', () => {
       },
     ];
 
-    assertDeepEquals(backslashMatchedRecords,
-                     fuzzySearch('\\test', records, options));
-    assertDeepEquals(quoteMatchedRecords,
-                     fuzzySearch('\"end', records, options));
+    assertDeepEquals(
+        backslashMatchedRecords, fuzzySearch('\\test', records, options));
+    assertDeepEquals(
+        quoteMatchedRecords, fuzzySearch('\"end', records, options));
   });
 
   test('Test exact match result scoring accounts for match position.', () => {

chrome/browser/resources/tab_search_merge/test/tab_search_app_focus_test.js → chrome/test/data/webui/tab_search_merge/tab_search_app_focus_test.js

@@ -6,7 +6,7 @@ import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {getDeepActiveElement} from 'chrome://resources/js/util.m.js';
 import {keyDownOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
 import {TabSearchAppElement} from 'chrome://tab-search/app.js';
-import {TabSearchApiProxy, TabSearchApiProxyImpl} from 'chrome://tab-search/tab_search_api_proxy.js'
+import {TabSearchApiProxy, TabSearchApiProxyImpl} from 'chrome://tab-search/tab_search_api_proxy.js';
 import {TabSearchItem} from 'chrome://tab-search/tab_search_item.js';
 import {TabSearchSearchField} from 'chrome://tab-search/tab_search_search_field.js';
 
@@ -53,7 +53,7 @@ suite('TabSearchAppFocusTest', () => {
     const searchField = /** @type {!TabSearchSearchField} */
         (tabSearchApp.shadowRoot.querySelector('#searchField'));
     const searchInput = /** @type {!HTMLInputElement} */
-        (searchField.shadowRoot.querySelector('#searchInput'))
+        (searchField.shadowRoot.querySelector('#searchInput'));
     assertEquals(searchInput, getDeepActiveElement());
 
     const tabSearchItems = /** @type {!NodeList<!HTMLElement>} */

chrome/browser/resources/tab_search_merge/test/tab_search_app_test.js → chrome/test/data/webui/tab_search_merge/tab_search_app_test.js

@@ -5,7 +5,7 @@
 import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {keyDownOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
 import {TabSearchAppElement} from 'chrome://tab-search/app.js';
-import {TabSearchApiProxy, TabSearchApiProxyImpl} from 'chrome://tab-search/tab_search_api_proxy.js'
+import {TabSearchApiProxy, TabSearchApiProxyImpl} from 'chrome://tab-search/tab_search_api_proxy.js';
 import {TabSearchItem} from 'chrome://tab-search/tab_search_item.js';
 import {TabSearchSearchField} from 'chrome://tab-search/tab_search_search_field.js';
 

chrome/browser/resources/tab_search_merge/test/tab_search_browsertest.js → chrome/test/data/webui/tab_search_merge/tab_search_browsertest.js

@@ -36,7 +36,7 @@ class TabSearchBrowserTest extends PolymerTest {
 var TabSearchAppTest = class extends TabSearchBrowserTest {
   /** @override */
   get browsePreload() {
-    return 'chrome://tab-search/test_loader.html?module=tab_search/test/tab_search_app_test.js';
+    return 'chrome://tab-search/test_loader.html?module=tab_search_merge/tab_search_app_test.js';
   }
 };
 
@@ -48,7 +48,7 @@ TEST_F('TabSearchAppTest', 'All', function() {
 var FuzzySearchTest = class extends TabSearchBrowserTest {
   /** @override */
   get browsePreload() {
-    return 'chrome://tab-search/test_loader.html?module=tab_search/test/fuzzy_search_test.js';
+    return 'chrome://tab-search/test_loader.html?module=tab_search_merge/fuzzy_search_test.js';
   }
 };
 
@@ -60,10 +60,10 @@ TEST_F('FuzzySearchTest', 'All', function() {
 var TabSearchItemTest = class extends TabSearchBrowserTest {
   /** @override */
   get browsePreload() {
-    return 'chrome://tab-search/test_loader.html?module=tab_search/test/tab_search_item_test.js';
+    return 'chrome://tab-search/test_loader.html?module=tab_search_merge/tab_search_item_test.js';
   }
 };
 
 TEST_F('TabSearchItemTest', 'All', function() {
   mocha.run();
-});
+});
\ No newline at end of file

chrome/browser/resources/tab_search_merge/test/tab_search_interactive_ui_tests.js → chrome/test/data/webui/tab_search_merge/tab_search_interactive_ui_tests.js

@@ -14,7 +14,7 @@ GEN('#include "services/network/public/cpp/features.h"');
 var TabSearchInteractiveUITest = class extends PolymerInteractiveUITest {
   /** @override */
   get browsePreload() {
-    return 'chrome://tab-search/test_loader.html?module=tab_search/test/tab_search_app_focus_test.js';
+    return 'chrome://tab-search/test_loader.html?module=tab_search_merge/tab_search_app_focus_test.js';
   }
 
   get extraLibraries() {
@@ -32,7 +32,7 @@ var TabSearchInteractiveUITest = class extends PolymerInteractiveUITest {
       ]
     };
   }
-}
+};
 
 TEST_F('TabSearchInteractiveUITest', 'All', function() {
   mocha.run();

chrome/browser/resources/tab_search_merge/test/test_tab_search_api_proxy.js → chrome/test/data/webui/tab_search_merge/test_tab_search_api_proxy.js

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import {TabSearchApiProxy} from 'chrome://tab-search/tab_search_api_proxy.js';
-import {TestBrowserProxy} from '../../test_browser_proxy.m.js';
+import {TestBrowserProxy} from '../test_browser_proxy.m.js';
 
 /** @implements {TabSearchApiProxy} */
 export class TestTabSearchApiProxy extends TestBrowserProxy {

tools/gritsettings/resource_ids.spec

@@ -179,7 +179,7 @@
     "META": {"sizes": {"includes": [50],}},
     "includes": [1850],
   },
-  "chrome/browser/resources/tab_search/tab_search_resources.grd": {
+  "chrome/browser/resources/tab_search_merge/tab_search_resources.grd": {
     "includes": [1880],
   },
   "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/tab_strip/tab_strip_resources.grd": {