4 files changed, 19 insertions, 321 deletions
diff --git a/android_webview/lib/android_webview.gyp b/android_webview/lib/android_webview.gyp
deleted file mode 100644
index aea913f..0000000
--- a/android_webview/lib/android_webview.gyp
+++ /dev/null
@@ -1,302 +0,0 @@
-# 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.
-{
-  'variables': {
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      'target_name': 'libwebview',
-      'type': 'shared_library',
-      'dependencies': [
-        '<(DEPTH)/chrome/chrome.gyp:browser',
-        '<(DEPTH)/chrome/chrome.gyp:renderer',
-        '<(DEPTH)/content/content.gyp:content',
-        '<(DEPTH)/android_webview/native/webview_native.gyp:webview_native',
-        '<(DEPTH)/chrome/browser/component/components.gyp:web_contents_delegate_android',
-        '<(DEPTH)/chrome/browser/component/components.gyp:browser_component_jni_headers',
-      ],
-      'include_dirs': [
-        '../..',
-        '../../skia/config',
-      ],
-      'sources': [
-        'aw_browser_dependency_factory_impl.cc',
-        'aw_browser_dependency_factory_impl.h',
-        'aw_content_browser_client.cc',
-        'aw_content_browser_client.h',
-        'main/webview_entry_point.cc',
-        'main/webview_main_delegate.cc',
-        'main/webview_main_delegate.h',
-        'main/webview_stubs.cc',
-      ],
-      'includes': [
-        '../aw_browser.gypi',
-      ],
-    },
-    {
-      'target_name': 'android_webview',
-      'type' : 'none',
-      'dependencies': [
-        'libwebview',
-      ],
-      'variables': {
-        'install_binary_script': '../build/install_binary',
-      },
-      'actions': [
-        {
-          'action_name': 'libwebview_strip_and_install_in_android',
-          'inputs': [
-            '<(SHARED_LIB_DIR)/libwebview.so',
-          ],
-          'outputs': [
-            '<(android_product_out)/obj/lib/libwebview.so',
-            '<(android_product_out)/system/lib/libwebview.so',
-            '<(android_product_out)/symbols/system/lib/libwebview.so',
-          ],
-          'action': [
-            '<(install_binary_script)',
-            '<@(_inputs)',
-            '<@(_outputs)',
-          ],
-        },
-      ],
-    },
-    {
-      'target_name': 'android_webview_java',
-      'type': 'none',
-      'dependencies': [
-        '<(DEPTH)/content/content.gyp:content_java',
-        '<(DEPTH)/chrome/browser/component/components.gyp:web_contents_delegate_android_java',
-      ],
-      'variables': {
-        'package_name': 'android_webview_java',
-        'java_in_dir': '<(DEPTH)/android_webview/java',
-      },
-      'includes': [ '../../build/java.gypi' ],
-    },
-    {
-      'target_name': 'android_webview_javatests',
-      'type': 'none',
-      'dependencies': [
-        'android_webview_java',
-        '<(DEPTH)/base/base.gyp:base_java_test_support',
-        '<(DEPTH)/content/content.gyp:content_java',
-        '<(DEPTH)/content/content.gyp:content_javatests',
-        '<(DEPTH)/chrome/browser/component/components.gyp:web_contents_delegate_android_java',
-      ],
-      'variables': {
-        'package_name': 'android_webview_javatests',
-        'java_in_dir': '<(DEPTH)/android_webview/javatests',
-      },
-      'includes': [ '../../build/java.gypi' ],
-    },
-
-    {
-      'target_name': 'android_webview_apk',
-      'type': 'none',
-      'actions': [
-      {
-        'action_name': 'copy_base_jar',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_base.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_net_jar',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_net.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_net.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_media_jar',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_media.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_media.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_content_jar',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_content.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_web_contents_delegate_android_java',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_web_contents_delegate_android.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_web_contents_delegate_android.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_android_webview_jar',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_android_webview_java.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_android_webview_java.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_android_webview_test_jar',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_android_webview_javatests.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_android_webview_javatests.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_chrome_pak',
-        'inputs': ['<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/assets/chrome.pak'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_chrome_100_percent_pak',
-        'inputs': ['<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/assets/chrome_100_percent.pak'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_resources_pak',
-        'inputs': ['<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/assets/resources.pak'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_en_pak',
-        'inputs': ['<(SHARED_INTERMEDIATE_DIR)/repack/en-US.pak'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/assets/en.pak'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_and_strip_so',
-        'inputs': ['<(SHARED_LIB_DIR)/libwebview.so'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/libs/<(android_app_abi)/libwebview.so'],
-        'action': [
-            '<!(/bin/echo -n $STRIP)',
-            '--strip-unneeded',  # All symbols not needed for relocation.
-            '<@(_inputs)',
-            '-o',
-            '<@(_outputs)',
-        ],
-      },
-      {
-        'action_name': 'android_webview_apk',
-        'inputs': [
-          '<(DEPTH)/android_webview/java/android_webview_apk.xml',
-          '<(DEPTH)/android_webview/java/AndroidManifest.xml',
-          '<(PRODUCT_DIR)/android_webview/java/libs/chromium_android_webview_java.jar',
-          '<(PRODUCT_DIR)/android_webview/java/libs/chromium_android_webview_javatests.jar',
-          '<(PRODUCT_DIR)/android_webview/java/libs/chromium_base.jar',
-          '<(PRODUCT_DIR)/android_webview/java/libs/chromium_net.jar',
-          '<(PRODUCT_DIR)/android_webview/java/libs/chromium_media.jar',
-          '<(PRODUCT_DIR)/android_webview/java/libs/chromium_content.jar',
-          '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
-          '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
-          '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
-          '<(SHARED_INTERMEDIATE_DIR)/repack/en-US.pak',
-          '<(PRODUCT_DIR)/android_webview/libs/<(android_app_abi)/libwebview.so',
-        ],
-        'outputs': [
-          '<(PRODUCT_DIR)/android_webview/AndroidWebView-debug.apk',
-        ],
-        'action': [
-          'ant',
-          '-DPRODUCT_DIR=<(ant_build_out)',
-          '-DAPP_ABI=<(android_app_abi)',
-          '-DANDROID_SDK=<(android_sdk)',
-          '-DANDROID_SDK_ROOT=<(android_sdk_root)',
-          '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
-          '-DANDROID_SDK_VERSION=<(android_sdk_version)',
-          '-DANDROID_TOOLCHAIN=<(android_toolchain)',
-          '-buildfile',
-          '<(DEPTH)/android_webview/java/android_webview_apk.xml',
-        ],
-        'dependencies': [
-          'libwebview',
-          'android_webview_java',
-          'android_webview_javatests',
-          '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
-          '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
-        ],
-      }
-      ],
-    },
-    {
-      'target_name': 'android_webview_test_apk',
-      'type': 'none',
-      'dependencies': [
-        'android_webview_apk',
-        '<(DEPTH)/content/content.gyp:content_javatests',
-      ],
-      'actions': [
-        {
-          'action_name': 'copy_base_jar',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_base.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'copy_base_javatests_jar',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base_javatests.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_base_javatests.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'copy_net_jar',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_net.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_net.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'copy_media_jar',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_media.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_media.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'copy_content_jar',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_content.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'copy_web_contents_delegate_android_java',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_web_contents_delegate_android.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_web_contents_delegate_android.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'copy_content_javatests_jar',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content_javatests.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_content_javatests.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'copy_android_webview_jar',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_android_webview_java.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_android_webview_java.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'android_webview_test_generate_apk',
-          'inputs': [
-            '<(DEPTH)/android_webview/javatests/android_webview_test_apk.xml',
-            '<(DEPTH)/android_webview/javatests/AndroidManifest.xml',
-            '<!@(find <(DEPTH)/android_webview/javatests/ -name "*.java")'
-          ],
-          'outputs': [
-            '<(PRODUCT_DIR)/android_webview_test/ContentShellTest-debug.apk',
-          ],
-          'action': [
-            'ant',
-            '-DPRODUCT_DIR=<(ant_build_out)',
-            '-DAPP_ABI=<(android_app_abi)',
-            '-DANDROID_SDK=<(android_sdk)',
-            '-DANDROID_SDK_ROOT=<(android_sdk_root)',
-            '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
-            '-DANDROID_SDK_VERSION=<(android_sdk_version)',
-            '-DANDROID_TOOLCHAIN=<(android_toolchain)',
-            '-buildfile',
-            '<(DEPTH)/android_webview/javatests/android_webview_test_apk.xml',
-          ]
-        }
-      ],
-    },
-  ],
-}
diff --git a/android_webview/lib/main/webview_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index 3e05463..611cf15 100644
--- a/android_webview/lib/main/webview_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "android_webview/lib/main/webview_main_delegate.h"
+#include "android_webview/lib/main/aw_main_delegate.h"
 
 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
 #include "android_webview/lib/aw_content_browser_client.h"
@@ -20,30 +20,30 @@ base::LazyInstance<AwContentBrowserClient>
 base::LazyInstance<chrome::ChromeContentRendererClient>
     g_webview_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
 
-WebViewMainDelegate::WebViewMainDelegate() {
+AwMainDelegate::AwMainDelegate() {
 }
 
-WebViewMainDelegate::~WebViewMainDelegate() {
+AwMainDelegate::~AwMainDelegate() {
 }
 
-bool WebViewMainDelegate::BasicStartupComplete(int* exit_code) {
+bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
   content::SetContentClient(&chrome_content_client_);
 
   return false;
 }
 
-void WebViewMainDelegate::PreSandboxStartup() {
+void AwMainDelegate::PreSandboxStartup() {
   chrome::RegisterPathProvider();
 
   // TODO(torne): When we have a separate renderer process, we need to handle
   // being passed open FDs for the resource paks here.
 }
 
-void WebViewMainDelegate::SandboxInitialized(const std::string& process_type) {
+void AwMainDelegate::SandboxInitialized(const std::string& process_type) {
   // TODO(torne): Adjust linux OOM score here.
 }
 
-int WebViewMainDelegate::RunProcess(
+int AwMainDelegate::RunProcess(
     const std::string& process_type,
     const content::MainFunctionParams& main_function_params) {
   if (process_type.empty()) {
@@ -61,19 +61,19 @@ int WebViewMainDelegate::RunProcess(
   return -1;
 }
 
-void WebViewMainDelegate::ProcessExiting(const std::string& process_type) {
+void AwMainDelegate::ProcessExiting(const std::string& process_type) {
   // TODO(torne): Clean up resources when we handle them.
 
   logging::CloseLogFile();
 }
 
 content::ContentBrowserClient*
-    WebViewMainDelegate::CreateContentBrowserClient() {
+    AwMainDelegate::CreateContentBrowserClient() {
   return &g_webview_content_browser_client.Get();
 }
 
 content::ContentRendererClient*
-    WebViewMainDelegate::CreateContentRendererClient() {
+    AwMainDelegate::CreateContentRendererClient() {
   return &g_webview_content_renderer_client.Get();
 }
 
diff --git a/android_webview/lib/main/webview_main_delegate.h b/android_webview/lib/main/aw_main_delegate.h
index 572ff0f..d005ef7 100644
--- a/android_webview/lib/main/webview_main_delegate.h
+++ b/android_webview/lib/main/aw_main_delegate.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_LIB_MAIN_WEBVIEW_MAIN_DELEGATE_H_
-#define ANDROID_WEBVIEW_LIB_MAIN_WEBVIEW_MAIN_DELEGATE_H_
+#ifndef ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_
+#define ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/chrome_content_client.h"
@@ -16,10 +16,10 @@ class BrowserMainRunner;
 namespace android_webview {
 
 // Android WebView implementation of ContentMainDelegate.
-class WebViewMainDelegate : public content::ContentMainDelegate {
+class AwMainDelegate : public content::ContentMainDelegate {
  public:
-  WebViewMainDelegate();
-  virtual ~WebViewMainDelegate();
+  AwMainDelegate();
+  virtual ~AwMainDelegate();
 
  private:
   // content::ContentMainDelegate implementation:
@@ -37,9 +37,9 @@ class WebViewMainDelegate : public content::ContentMainDelegate {
   scoped_ptr<content::BrowserMainRunner> browser_runner_;
   chrome::ChromeContentClient chrome_content_client_;
 
-  DISALLOW_COPY_AND_ASSIGN(WebViewMainDelegate);
+  DISALLOW_COPY_AND_ASSIGN(AwMainDelegate);
 };
 
 }  // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_LIB_MAIN_WEBVIEW_MAIN_DELEGATE_H_
+#endif  // ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_
diff --git a/android_webview/lib/main/webview_entry_point.cc b/android_webview/lib/main/webview_entry_point.cc
index 2053910..567161e 100644
--- a/android_webview/lib/main/webview_entry_point.cc
+++ b/android_webview/lib/main/webview_entry_point.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "android_webview/lib/main/webview_main_delegate.h"
+#include "android_webview/lib/main/aw_main_delegate.h"
 #include "android_webview/native/android_webview_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "content/public/app/android_library_loader_hooks.h"
@@ -19,7 +19,7 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   if (!android_webview::RegisterJni(env))
     return -1;
 
-  content::SetContentMainDelegate(new android_webview::WebViewMainDelegate());
+  content::SetContentMainDelegate(new android_webview::AwMainDelegate());
 
   return JNI_VERSION_1_4;
 }