| Index: content/shell/android/BUILD.gn
 | 
| diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn
 | 
| index 756416dc5b42616e76a7c3916540615072ce9fac..bbffa7387f5ebf91627e559ef115091760ab832e 100644
 | 
| --- a/content/shell/android/BUILD.gn
 | 
| +++ b/content/shell/android/BUILD.gn
 | 
| @@ -22,11 +22,11 @@ shared_library("libcontent_shell_content_view") {
 | 
|    deps = [
 | 
|      ":content_shell_jni_headers",
 | 
|      "//build/config/sanitizers:deps",
 | 
| +    "//components/crash/content/browser",
 | 
|      "//content/shell:content_shell_lib",
 | 
|      "//content/shell:pak",
 | 
| -    "//components/crash/content/browser",
 | 
| -    "//skia",
 | 
|      "//media/base/android",
 | 
| +    "//skia",
 | 
|    ]
 | 
|    sources = [
 | 
|      "shell_library_loader.cc",
 | 
| @@ -42,13 +42,13 @@ android_resources("content_shell_java_resources") {
 | 
|  android_library("content_shell_java") {
 | 
|    testonly = true
 | 
|    deps = [
 | 
| +    ":content_shell_java_resources",
 | 
|      "//base:base_java",
 | 
|      "//content/public/android:content_java",
 | 
|      "//media/base/android:media_java",
 | 
|      "//mojo/public/java:system",
 | 
|      "//net/android:net_java",
 | 
|      "//ui/android:ui_java",
 | 
| -    ":content_shell_java_resources",
 | 
|    ]
 | 
|    DEPRECATED_java_in_dir = "java/src"
 | 
|  }
 | 
| @@ -126,21 +126,21 @@ android_apk("content_shell_apk") {
 | 
|  android_library("content_shell_test_java") {
 | 
|    testonly = true
 | 
|    deps = [
 | 
| -    ":content_shell_java",
 | 
|      ":content_shell_apk_java",
 | 
| +    ":content_shell_java",
 | 
|      "//base:base_java",
 | 
|      "//base:base_java_test_support",
 | 
| +    "//content/public/android:content_java",
 | 
|      "//content/public/test/android:content_java_test_support",
 | 
|      "//content/shell/android:content_shell_java",
 | 
| -    "//content/public/android:content_java",
 | 
|    ]
 | 
|    DEPRECATED_java_in_dir = "javatests/src"
 | 
|  }
 | 
|  
 | 
|  instrumentation_test_apk("content_shell_test_apk") {
 | 
|    deps = [
 | 
| -    "//content/public/android:content_javatests",
 | 
|      "//base:base_javatests",
 | 
| +    "//content/public/android:content_javatests",
 | 
|      "//net/android:net_javatests",
 | 
|    ]
 | 
|    data_deps = [
 | 
| 
 |