Move WebContentsDelegateAndroid to content/components

android_webview/Android.mk

 # Copyright (c) 2012 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.
 
 # This package provides the parts of the WebView java code which live in the
 # Chromium tree. This is built into a static library so it can be used by the
 # glue layer in the Android tree.
 
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
@@ skipping 10 matching lines @@
     $(call all-java-files-under, ../content/public/android/java/src) \
     ../content/public/android/java/src/org/chromium/content/common/ISandboxedProcessCallback.aidl \
     ../content/public/android/java/src/org/chromium/content/common/ISandboxedProcessService.aidl \
     $(call all-java-files-under, ../base/android/java/src) \
     $(call all-java-files-under, ../media/base/android/java/src) \
     $(call all-java-files-under, ../net/android/java/src) \
     $(call all-java-files-under, ../ui/android/java/src) \
 
 # browser components
 LOCAL_SRC_FILES += \
-    $(call all-java-files-under, ../chrome/browser/component/web_contents_delegate_android/java/src) \
+    $(call all-java-files-under, \
+        ../content/components/web_contents_delegate_android/java/src) \
     $(call all-java-files-under, \
         ../content/components/navigation_interception/java/src) \
 
 # TODO(mkosiba): Remove chromium_chrome dep once required browser
 # components are in (replace it with contentview).
 LOCAL_SRC_FILES += \
     $(call all-java-files-under, ../chrome/android/java/src) \
 
 # This file is generated by net.gyp:net_errors_java
 LOCAL_GENERATED_SOURCES := $(call intermediates-dir-for,GYP,shared)/net/template/NetError.java \
@@ skipping 13 matching lines @@
 LOCAL_MODULE := webviewchromium_res_chrome_100_percent
 LOCAL_MODULE_STEM := chrome_100_percent
 include $(LOCAL_PATH)/webview_pak.mk
 
 # TODO(torne): add other locales (filtered by PRODUCT_LOCALES?)
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_res_en-US
 LOCAL_MODULE_STEM := en-US
 LOCAL_BUILT_MODULE_STEM := locales/en-US.pak
 include $(LOCAL_PATH)/webview_pak.mk