[WebView] native/ browser/ merge cleanup

android_webview/test/BUILD.gn

 # Copyright 2015 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("//build/config/android/rules.gni")
 import("//testing/test.gni")
 
 # Mark all targets as test only.
 testonly = true
 
@@ skipping 227 matching lines @@
     "//android_webview:common",
     "//base/test:test_support",
     "//content/test:test_support",
     "//net:test_support",
     "//ui/base:ui_base_jni_headers",
     "//ui/gl",
     "//ui/gl:test_support",
   ]
 
   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") {
   sources = [
     "unittest/assets/asset_file.ogg",
   ]
 }
 
 android_library("android_webview_unittests_java") {
   testonly = true
@@ skipping 15 matching lines @@
     "../unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java",
   ]
 }
 
 shared_library("libdrawgl") {
   sources = [
     "shell/src/draw_gl/draw_gl.cc",
   ]
   configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
 }