Revert "Reland "Move a bunch of ChromeOS APIs out of chrome/browser/extensions."""

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index f87a5e2cc5ae08a4d88b66b35b1e2a7f9e05b8da..cd9f4ed2de7a1ff0112fee58a72e8bfb115f8eec 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2468,11 +2468,7 @@
         'browser/chromeos/cros/mock_screen_lock_library.h',
         'browser/chromeos/disks/mock_disk_mount_manager.cc',
         'browser/chromeos/disks/mock_disk_mount_manager.h',
-        'browser/chromeos/extensions/file_browser_extension_apitest.cc',
         'browser/chromeos/extensions/file_browser_notifications_browsertest.cc',
-        'browser/chromeos/extensions/get_chromeos_info_extension_apitest.cc',
-        'browser/chromeos/extensions/input_ime_extension_apitest.cc',
-        'browser/chromeos/extensions/input_method_extension_apitest.cc',
         'browser/chromeos/login/enrollment/enterprise_enrollment_screen_browsertest.cc',
         'browser/chromeos/login/existing_user_controller_browsertest.cc',
         'browser/chromeos/login/login_browsertest.cc',
@@ -2555,6 +2551,7 @@
         'browser/extensions/extension_devtools_browsertest.h',
         'browser/extensions/extension_devtools_browsertests.cc',
         'browser/extensions/extension_dom_clipboard_apitest.cc',
+        'browser/extensions/extension_file_browser_private_apitest.cc',
         'browser/extensions/extension_fileapi_apitest.cc',
         'browser/extensions/extension_function_test_utils.cc',
         'browser/extensions/extension_function_test_utils.h',
@@ -2564,7 +2561,10 @@
         'browser/extensions/extension_icon_source_apitest.cc',
         'browser/extensions/extension_idle_apitest.cc',
         'browser/extensions/extension_incognito_apitest.cc',
+        'browser/extensions/extension_info_private_apitest_chromeos.cc',
         'browser/extensions/extension_input_apitest.cc',
+        'browser/extensions/extension_input_ime_apitest.cc',
+        'browser/extensions/extension_input_method_apitest.cc',
         'browser/extensions/extension_input_ui_apitest.cc',
         'browser/extensions/extension_install_ui_browsertest.cc',
         'browser/extensions/extension_javascript_url_apitest.cc',
@@ -2800,8 +2800,8 @@
           ],
           'sources!': [
             'browser/chromeos/media/media_player_browsertest.cc',
-            'browser/chromeos/extensions/file_browser_extension_apitest.cc',
-            'browser/chromeos/extensions/input_method_extension_apitest.cc',
+            'browser/extensions/extension_file_browser_private_apitest.cc',
+            'browser/extensions/extension_input_method_apitest.cc',
             'browser/oom_priority_manager_browsertest.cc',
             'browser/policy/enterprise_metrics_enrollment_browsertest.cc',
             'browser/ui/views/status_icons/status_tray_chromeos_browsertest.cc',