Instant/LocalNTP tests cleanup

chrome/test/BUILD.gn

Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index b03c6c9b2158ca0d617d514f4c776591cd7d2344..2fd8dd31c9de462fa658035fdb3054ebe02f9e07 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -387,9 +387,13 @@ if (!is_android) {
       "../browser/ui/passwords/manage_passwords_test.h",
       "../browser/ui/search/instant_extended_interactive_uitest.cc",
       "../browser/ui/search/instant_extended_manual_interactive_uitest.cc",
+      "../browser/ui/search/instant_test_base.cc",
+      "../browser/ui/search/instant_test_base.h",
       "../browser/ui/search/instant_test_utils.cc",
       "../browser/ui/search/instant_test_utils.h",
-      "../browser/ui/search/local_ntp_browsertest.cc",
+      "../browser/ui/search/instant_uitest_base.cc",
+      "../browser/ui/search/instant_uitest_base.h",
+      "../browser/ui/search/local_ntp_uitest.cc",
       "../browser/ui/startup/startup_browser_creator_interactive_uitest.cc",
       "../browser/ui/translate/translate_bubble_test_utils.h",
       "../browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc",
@@ -1599,6 +1603,11 @@ test("browser_tests") {
       "../browser/ui/permission_bubble/permission_bubble_browser_test_util.h",
       "../browser/ui/prefs/prefs_tab_helper_browsertest.cc",
       "../browser/ui/profile_error_browsertest.cc",
+      "../browser/ui/search/instant_test_base.cc",
+      "../browser/ui/search/instant_test_base.h",
+      "../browser/ui/search/instant_test_utils.cc",
+      "../browser/ui/search/instant_test_utils.h",
+      "../browser/ui/search/local_ntp_browsertest.cc",
       "../browser/ui/search/new_tab_page_interceptor_browsertest.cc",
       "../browser/ui/search_engines/search_engine_tab_helper_browsertest.cc",
       "../browser/ui/settings_window_manager_browsertest.cc",