[WebView] native/ browser/ merge cleanup

android_webview/test/BUILD.gn

Index: android_webview/test/BUILD.gn
diff --git a/android_webview/test/BUILD.gn b/android_webview/test/BUILD.gn
index c60e8068ba183184454bb4592ef0262a9b23b54a..e4d927b884337583cffa3a4b34c8e765fc6118ef 100644
--- a/android_webview/test/BUILD.gn
+++ b/android_webview/test/BUILD.gn
@@ -245,34 +245,28 @@ test("android_webview_unittests") {
   ]
 
   sources = [
+    "../browser/address_parser_unittest.cc",
+    "../browser/aw_contents_client_bridge_unittest.cc",
     "../browser/aw_form_database_service_unittest.cc",
+    "../browser/aw_media_url_interceptor_unittest.cc",
     "../browser/aw_permission_manager_unittest.cc",
     "../browser/aw_static_cookie_policy_unittest.cc",
     "../browser/browser_view_renderer_unittest.cc",
     "../browser/command_line_helper_unittest.cc",
+    "../browser/input_stream_unittest.cc",
     "../browser/net/android_stream_reader_url_request_job_unittest.cc",
     "../browser/net/aw_cookie_store_wrapper_unittest.cc",
     "../browser/net/input_stream_reader_unittest.cc",
+    "../browser/permission/media_access_permission_request_unittest.cc",
+    "../browser/permission/permission_request_handler_unittest.cc",
     "../browser/renderer_host/auto_login_parser_unittest.cc",
+    "../browser/state_serializer_unittest.cc",
     "../browser/test/fake_window.cc",
     "../browser/test/fake_window.h",
     "../browser/test/rendering_test.cc",
     "../browser/test/rendering_test.h",
     "../lib/main/webview_tests.cc",
   ]
-
-  # TODO(ctzsm): Remove following block.
-  # Take out old native/ tests files from sources for now
-  # for easier distinguishing them from actual browser/ files.
-  sources += [
-    "../browser/address_parser_unittest.cc",
-    "../browser/aw_contents_client_bridge_unittest.cc",
-    "../browser/aw_media_url_interceptor_unittest.cc",
-    "../browser/input_stream_unittest.cc",
-    "../browser/permission/media_access_permission_request_unittest.cc",
-    "../browser/permission/permission_request_handler_unittest.cc",
-    "../browser/state_serializer_unittest.cc",
-  ]
 }
 
 android_assets("android_webview_unittests_assets") {