Revert of Revert of Add AwAssets into android_webview/native/public (patchset #1 id:1 of https://codereview.chromium.org/947113002/)

Reason for revert:
https://codereview.chromium.org/950973003/ is just landed to fix the deps problem.

Original issue's description:
> Revert of Add AwAssets into android_webview/native/public (patchset #4 id:70009 of https://codereview.chromium.org/937863003/)
>
> Reason for revert:
> Suspected to cause 'checkdeps' failures on Linux bot:
> http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests/builds/20990/steps/checkdeps/logs/stdio
>
> ERROR in /mnt/data/b/build/slave/Linux_Tests/build/src/android_webview/browser/aw_dev_tools_manager_delegate.cc
>   Illegal include: "android_webview/native/aw_contents.h"
>     Because of "-android_webview" from android_webview/browser's include_rules.
>
> Original issue's description:
> > Add AwAssets into android_webview/native/public
> >
> > This is done so that android_webview/browser doesn't need to depend on
> > android_webview/native
> >
> > BUG=459779
> >
> > Committed: https://crrev.com/a08360b39730751c5f85797bdff5b748d907c11a
> > Cr-Commit-Position: refs/heads/master@{#317475}
>
> TBR=boliu@chromium.org,sgurun@chromium.org,hush@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=459779
>
> Committed: https://crrev.com/34cd1a9f17f7b4509753b0184e7ac3463ab43d13
> Cr-Commit-Position: refs/heads/master@{#317567}

TBR=boliu@chromium.org,sgurun@chromium.org,binjin@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=459779

Review URL: https://codereview.chromium.org/957423002

Cr-Commit-Position: refs/heads/master@{#318274}

5 files changed, 8 insertions, 8 deletions

diff --git a/android_webview/native/android_webview_jni_registrar.cc b/android_webview/native/android_webview_jni_registrar.cc
index a9aa621..1de8c4c 100644
--- a/android_webview/native/android_webview_jni_registrar.cc
+++ b/android_webview/native/android_webview_jni_registrar.cc
@@ -5,7 +5,6 @@
 #include "android_webview/native/android_webview_jni_registrar.h"
 
 #include "android_webview/native/android_protocol_handler.h"
-#include "android_webview/native/aw_assets.h"
 #include "android_webview/native/aw_autofill_client.h"
 #include "android_webview/native/aw_contents.h"
 #include "android_webview/native/aw_contents_client_bridge.h"
@@ -27,6 +26,7 @@
 #include "android_webview/native/input_stream_impl.h"
 #include "android_webview/native/java_browser_view_renderer_helper.h"
 #include "android_webview/native/permission/aw_permission_request.h"
+#include "android_webview/native/public/aw_assets.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/trace_event/trace_event.h"
diff --git a/android_webview/native/aw_media_url_interceptor.cc b/android_webview/native/aw_media_url_interceptor.cc
index 1b214da..3f52d9c 100644
--- a/android_webview/native/aw_media_url_interceptor.cc
+++ b/android_webview/native/aw_media_url_interceptor.cc
@@ -5,8 +5,8 @@
 #include <string>
 
 #include "android_webview/common/url_constants.h"
-#include "android_webview/native/aw_assets.h"
 #include "android_webview/native/aw_media_url_interceptor.h"
+#include "android_webview/native/public/aw_assets.h"
 #include "base/strings/string_util.h"
 #include "content/public/common/url_constants.h"
 
diff --git a/android_webview/native/aw_assets.cc b/android_webview/native/public/aw_assets.cc
index ba734ae..e13d04e 100644
--- a/android_webview/native/aw_assets.cc
+++ b/android_webview/native/public/aw_assets.cc
@@ -4,7 +4,7 @@
 
 #include <jni.h>
 
-#include "android_webview/native/aw_assets.h"
+#include "android_webview/native/public/aw_assets.h"
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
diff --git a/android_webview/native/aw_assets.h b/android_webview/native/public/aw_assets.h
index 16fcafb..9eacabf 100644
--- a/android_webview/native/aw_assets.h
+++ b/android_webview/native/public/aw_assets.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ANDROID_WEBVIEW_NATIVE_AW_ASSETS_H_
-#define ANDROID_WEBVIEW_NATIVE_AW_ASSETS_H_
+#ifndef ANDROID_WEBVIEW_NATIVE_PUBLIC_AW_ASSETS_H_
+#define ANDROID_WEBVIEW_NATIVE_PUBLIC_AW_ASSETS_H_
 
 #include <string>
 
@@ -33,4 +33,4 @@ bool RegisterAwAssets(JNIEnv* env);
 
 }  // namsespace android_webview
 
-#endif  // ANDROID_WEBVIEW_NATIVE_AW_ASSETS_H_
+#endif  // ANDROID_WEBVIEW_NATIVE_PUBLIC_AW_ASSETS_H_
diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
index 34889e1..121a876 100644
--- a/android_webview/native/webview_native.gyp
+++ b/android_webview/native/webview_native.gyp
@@ -36,8 +36,6 @@
         'android_protocol_handler.h',
         'android_webview_jni_registrar.cc',
         'android_webview_jni_registrar.h',
-        'aw_assets.cc',
-        'aw_assets.h',
         'aw_autofill_client.cc',
         'aw_autofill_client.h',
         'aw_browser_dependency_factory.cc',
@@ -97,6 +95,8 @@
         'permission/permission_request_handler_client.h',
         'permission/simple_permission_request.cc',
         'permission/simple_permission_request.h',
+        'public/aw_assets.cc',
+        'public/aw_assets.h',
         'state_serializer.cc',
         'state_serializer.h',
       ],