refs/pending/branch-heads/2158 
diff --git a/.clang-format b/.clang-format
deleted file mode 100644
index 0a89601..0000000
--- a/.clang-format
+++ /dev/null
@@ -1,3 +0,0 @@
-# Defines the Chromium style for automatic reformatting.
-# http://clang.llvm.org/docs/ClangFormatStyleOptions.html
-BasedOnStyle: Chromium
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 21a13a6..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,7 +0,0 @@
-## This page intentionally left blank. ##
-#
-# Workaround for VS2013 automatically creating .gitattributes files with
-# default settings that we don't want.
-# See also:
-# http://connect.microsoft.com/VisualStudio/feedback/details/804948/inappropriately-creates-gitattributes-file
-# http://crbug.com/342064
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8df6781..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,395 +0,0 @@
-*.gypcmd
-*.mk
-*.ncb
-*.opensdf
-*.props
-*.pyc
-*.rules
-*.sdf
-*.sln
-*.suo
-*.targets
-*.user
-*.vcproj
-*.vcxproj
-*.vcxproj.filters
-*.vpj
-*.vpw
-*.vpwhistu
-*.vtg
-*.xcodeproj
-*.xcworkspace
-*_proto.xml
-*_proto_cpp.xml
-*~
-!Android.mk
-.*.sw?
-.DS_Store
-.classpath
-.cproject
-.gdb_history
-.gdbinit
-.landmines
-.metadata
-.project
-.pydevproject
-# Settings directory for eclipse
-/.settings
-.checkstyle
-cscope.*
-Session.vim
-tags
-Thumbs.db
-v8.log
-/_out
-/android_emulator_sdk
-/arm-sysroot
-/base/base_unittests_run.xml
-/breakpad/src/
-/build/Debug
-/build/Debug_x64
-/build/gomacc.lock
-/build/ipch/
-/build/Release
-/build/Release_x64
-/build/win_toolchain.json
-/build/util/LASTCHANGE*
-/build/util/support
-/build/x64/
-/build/linux/bin/eu-strip
-/buildtools
-# The Chrome OS build creates a /c symlink due to http://crbug.com/54866.
-/c
-/ceee/internal/
-/chrome/angle_unittests_run.xml
-/chrome/content_gl_tests_run.xml
-/chrome/gl_tests_run.xml
-/chrome/gles2_conform_test_run.xml
-/chrome/tab_capture_performance_tests_run.xml
-/chrome/telemetry_gpu_test_run.xml
-/chrome/app/theme/default_100_percent/google_chrome
-/chrome/app/theme/default_200_percent/google_chrome
-/chrome/app/theme/google_chrome
-/chrome/browser/autofill/internal
-/chrome/browser/extensions/api/ledger/
-/chrome/browser/extensions/default_extensions/chromeos
-/chrome/browser/google/linkdoctor_internal
-/chrome/browser/intents/internal/
-/chrome/browser/internal
-/chrome/browser/performance_monitor/performance_monitor.xml
-/chrome/browser/protector/internal
-/chrome/browser/resources/chromeos/quickoffice
-/chrome/browser/resources/pdf/html_office
-/chrome/browser/resources/settings_internal/
-/chrome/browser/resources/software_rendering_list
-/chrome/browser/spellchecker/internal
-/chrome/browser_tests_run.xml
-/chrome/chrome_run.xml
-/chrome/chrome_user32_delay_imports.xml
-/chrome/chrome_version_resources.xml
-/chrome/common/extensions/api/api.xml
-/chrome/common/extensions/api/ledger/
-/chrome/Hammer
-/chrome/installer/linux/debian_wheezy_amd64-sysroot/
-/chrome/installer/linux/debian_wheezy_i386-sysroot/
-/chrome/installer/linux/internal
-/chrome/installer/mac/internal
-/chrome/installer/mac/third_party/xz/xz
-/chrome/installer/mini_installer.xml
-/chrome/installer/mini_installer/mini_installer.aps
-/chrome/installer/mini_installer/support
-/chrome/installer/mini_installer_syzygy.xml
-/chrome/installer/mini_installer_tests_run.xml
-/chrome/installer_util_strings.xml
-/chrome/interactive_ui_tests_run.xml
-/chrome/setup.xml
-/chrome/setup_unittests.xml
-/chrome/supplement.gypi
-/chrome/sync_integration_tests_run.xml
-/chrome/test/chromeos/autotest/files/client/deps/chrome_test/test_src/
-/chrome/test/chromeos/autotest/files/client/deps/page_cycler_dep/test_src/
-/chrome/test/chromeos/autotest/files/client/deps/perf_data_dep/test_src/
-/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/test_src/
-/chrome/test/chromeos/autotest/files/client/deps/telemetry_dep/test_src/
-/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin
-/chrome/test/data/firefox2_profile/searchplugins
-/chrome/test/data/firefox2_searchplugins
-/chrome/test/data/firefox3_profile/searchplugins
-/chrome/test/data/firefox3_searchplugins
-/chrome/test/data/gpu/vectortown_endurance/
-/chrome/test/data/gpu/vt/
-/chrome/test/data/layout_tests
-/chrome/test/data/osdd
-/chrome/test/data/pdf_private
-/chrome/test/data/perf/canvas_bench
-/chrome/test/data/perf/frame_rate/content
-/chrome/test/data/perf/frame_rate/private
-/chrome/test/data/perf/private/
-/chrome/test/data/perf/third_party/
-/chrome/test/data/plugin/
-/chrome/test/data/webrtc/resources
-/chrome/tools/memory
-/chrome/tools/test/reference_build
-/chrome/unit_tests_run.xml
-/chrome_elf/chrome_elf_resources.xml
-/cloud_print/cloud_print_version_resources.xml
-/components/chrome_settings_proto_generated_compile.xml
-/components/cloud_policy_proto_generated_compile.xml
-/components/rappor.xml
-/components/search_engines/prepopulated_engines.xml
-/components/variations.xml
-/content/content_unittests_run.xml
-/content/test/data/gpu/generated/
-/content/test/data/gpu/gpu_reference/
-/content/test/data/layout_tests/
-/content/test/data/plugin/
-/data
-/delegate_execute
-/google_apis/gcm/gcm.xml
-/google_apis/internal
-/googleurl
-/gpu/gles2_conform_test
-/gyp-mac-tool
-/llvm
-/media/cast/logging/cast_logging_proto_lib.xml
-/media/cdm/ppapi/api
-/media/media_asm.xml
-/media/test/data/content
-/media/test/data/security
-/media/yuv_convert_simd_x86.xml
-/metro_driver
-/mojo/hello_world_service.xml
-/mojo/mojo_application_manager_unittests.xml
-/mojo/mojo_gles2_bindings.xml
-/mojo/mojo_launcher_bindings.xml
-/mojo/mojo_native_viewport_bindings.xml
-/mojo/mojo_public_bindings_unittests.xml
-/mojo/mojo_public_unittests.xml
-/mojo/mojo_sample_service.xml
-/mojo/mojo_shell_bindings.xml
-/mojo/mojo_view_manager_bindings.xml
-/mojo/mojom_test.xml
-/mojo/sample_service.xml
-/native_client
-/net/Debug
-/net/net_unittests_run.xml
-/net/Release
-/net/testserver.log
-/out
-/out_*
-/ppapi/native_client/nacl_irt.xml
-/ppapi/native_client/ppapi_lib.xml
-/ppapi/native_client/src/shared/ppapi_proxy/nacl_ppapi_browser.xml
-/ppapi/native_client/src/shared/ppapi_proxy/ppruntime_lib.xml
-/ppapi/native_client/src/trusted/plugin/ppGoogleNaClPluginChrome.xml
-/remoting/appengine/
-/remoting/host/installer/linux/internal/
-/remoting/proto/chromotocol_proto_lib.xml
-/remoting/proto/trace_proto_lib.xml
-/remoting/remoting_core_resources.xml
-/remoting/remoting_elevated_controller.xml
-/remoting/remoting_host.xml
-/remoting/remoting_host_event_logger.xml
-/remoting/remoting_host_installation.xml
-/remoting/remoting_host_installation_unittest.xml
-/remoting/remoting_host_messages.xml
-/remoting/remoting_infoplist_strings.xml
-/remoting/remoting_lib_idl.xml
-/remoting/remoting_lib_rc.xml
-/remoting/remoting_me2me_host.xml
-/remoting/remoting_native_messaging_manifests.xml
-/remoting/remoting_version_resources.xml
-/remoting/remoting_windows_resources.xml
-/remoting/tools/internal/
-/sandbox/linux/seccomp-legacy/
-/sdch/open-vcdiff
-/seccompsandbox
-/skia/tools/clusterfuzz-data/
-/sync/sync.xml
-/sync_testserver.log
-/testing/gmock
-/testing/gtest
-/testing/iossim/third_party/
-/testserver.log
-/third_party/accessibility-developer-tools/
-/third_party/adobe/flash/binaries
-/third_party/adobe/flash/symbols
-/third_party/amd/
-/third_party/android_protobuf/src
-/third_party/android_tools/
-/third_party/android_tools_internal/
-/third_party/android_webview_glue/src
-/third_party/angle
-/third_party/angle_dx11
-/third_party/aosp
-/third_party/apache-mime4j
-/third_party/apache-win32/bin/*.exe
-/third_party/apache-win32/bin/*.dll
-/third_party/apache-win32/bin/iconv/*.so
-/third_party/apache-win32/modules/*.so
-/third_party/apache-win32/modules/*.dll
-/third_party/asan
-/third_party/bidichecker
-/third_party/bison
-/third_party/boringssl/src
-/third_party/brotli/src
-/third_party/cacheinvalidation/cacheinvalidation_unittests_run.xml
-/third_party/cacheinvalidation/src
-/third_party/chromeos_login_manager
-/third_party/chromeos_text_input
-/third_party/chromite
-/third_party/cld_2/src
-/third_party/colorama/src
-/third_party/cros
-/third_party/cros_system_api
-/third_party/cygwin
-/third_party/directxsdk
-/third_party/drmemory/drmemory-windows-sfx.exe
-/third_party/drmemory/unpacked
-/third_party/elfutils/src
-/third_party/eyesfree/src
-/third_party/ffmpeg
-/third_party/findbugs
-/third_party/flac
-/third_party/fontconfig/src
-/third_party/freetype
-/third_party/freetype2/src
-/third_party/gles2_conform
-/third_party/gnu_binutils/
-/third_party/google_appengine_cloudstorage
-/third_party/google_toolbox_for_mac/src
-/third_party/googlemac
-/third_party/gperf
-/third_party/guava/src
-/third_party/httpcomponents-client
-/third_party/httpcomponents-core
-/third_party/hunspell
-/third_party/hunspell_dictionaries
-/third_party/icu
-/third_party/jarjar
-/third_party/jsoncpp/source
-/third_party/jsr-305/src
-/third_party/leveldatabase/src
-/third_party/leveldb
-/third_party/libaddressinput/src
-/third_party/libc++/trunk
-/third_party/libc++abi/trunk
-/third_party/libexif/sources
-/third_party/libjingle/source
-/third_party/libjingle/source_internal
-/third_party/libjpeg_turbo
-/third_party/liblouis/src
-/third_party/libphonenumber/libphonenumber.xml
-/third_party/libphonenumber/libphonenumber_without_metadata.xml
-/third_party/libphonenumber/src
-/third_party/libsrtp
-/third_party/libvpx
-/third_party/libwebm/source
-/third_party/libyuv
-/third_party/lighttpd
-/third_party/llvm
-/third_party/llvm-allocated-type
-/third_party/llvm-build
-/third_party/lss
-/third_party/mesa/src
-/third_party/mingw-w64
-/third_party/mkl
-/third_party/nacl_sdk_binaries/
-/third_party/nss
-/third_party/openmax_dl/
-/third_party/opus/src
-/third_party/ots
-/third_party/pdfsqueeze
-/third_party/pdfium
-/third_party/pefile
-/third_party/perl
-/third_party/platformsdk_win7
-/third_party/platformsdk_win8
-/third_party/polymer
-/third_party/polymer_legacy
-/third_party/ppapi
-/third_party/psyco_win32
-/third_party/pthreads-win32
-/third_party/pyelftools
-/third_party/pyftpdlib/src
-/third_party/pylib
-/third_party/pymox/src
-/third_party/python_24
-/third_party/python_26
-/third_party/pywebsocket/src
-/third_party/pywebsocket/src
-/third_party/safe_browsing/testing
-/third_party/scons-2.0.1
-/third_party/sfntly/cpp
-/third_party/skia
-/third_party/smhasher
-/third_party/snappy/src
-/third_party/speex
-/third_party/swiftshader/include/
-/third_party/swig
-/third_party/syzygy
-/third_party/syzygy/binaries
-/third_party/trace-viewer
-/third_party/tsan/
-/third_party/undoview
-/third_party/usb_ids
-/third_party/usrsctp/usrsctplib
-/third_party/v8-i18n
-/third_party/valgrind
-/third_party/v4l2capture
-/third_party/webdriver/pylib
-/third_party/webdriver/python/selenium
-/third_party/webgl
-/third_party/webgl/src
-/third_party/WebKit
-/third_party/webpagereplay/
-/third_party/webrtc
-/third_party/webrtc/internal
-/third_party/webrtc/modules/video_coding/codecs/vp8_internal
-/third_party/widevine/cdm/chromeos
-/third_party/widevine/cdm/linux
-/third_party/widevine/cdm/mac
-/third_party/widevine/cdm/win
-/third_party/widevine/test/license_server
-/third_party/win_toolchain/.timestamps
-/third_party/win_toolchain/files
-/third_party/wix
-/third_party/xdg-utils
-/third_party/xulrunner-sdk
-/third_party/yasm/binaries
-/third_party/yasm/generate_files.xml
-/third_party/yasm/source/patched-yasm
-/third_party/yasm/yasm.xml
-/tools/deps2git/
-/tools/distcc
-/tools/gn/bin/linux
-/tools/gn/bin/mac
-/tools/gn/bin/win
-/tools/grit
-/tools/gyp
-/tools/histograms
-/tools/json_schema_compiler/test/json_schema_compiler_tests.xml
-/tools/metrics/histograms/histograms.before.pretty-print.xml
-/tools/page_cycler/acid3
-/tools/perf/data
-/tools/perf/internal
-/tools/perf/results.html
-/tools/swarming_client
-/tools/tryserver
-/tools/win/link_limiter/build
-/ui/surface/surface.xml
-/ui/surface/surface_gpu_tests.xml
-/v8
-/webkit/data/bmp_decoder
-/webkit/data/ico_decoder
-/webkit/data/layout_tests/LayoutTests
-/webkit/data/test_shell/plugins
-/webkit/data/xbm_decoder
-/webkit/Debug
-/webkit/Release
-/webkit/renderer/media/crypto/ppapi/cdm
-/webpagereplay_logs/
-/win8/delegate_execute/delegate_execute_version_resources.xml
-/win8/metro_driver/metro_driver_version_resources.xml
-/x86-generic_out/
-/xcodebuild
diff --git a/.gn b/.gn
deleted file mode 100644
index e8cf92b0..0000000
--- a/.gn
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file is used by the experimental meta-buildsystem in src/tools/gn to
-# find the root of the source tree and to set startup options.
-
-# The location of the build configuration file.
-buildconfig = "//build/config/BUILDCONFIG.gn"
-
-# The secondary source root is a parallel directory tree where
-secondary_source = "//build/secondary/"
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 65f7f0c..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,492 +0,0 @@
-# Names should be added to this file with this pattern:
-#
-# For individuals:
-#   Name <email address>
-#
-# For organizations:
-#   Organization <fnmatch pattern>
-#
-# See python fnmatch module documentation for more information.
-
-Aaron Jacobs <samusaaron3@gmail.com>
-Aaron Leventhal <aaronlevbugs@gmail.com>
-Aaron Randolph <aaron.randolph@gmail.com>
-Abhishek Agarwal <abhishek.a21@samsung.com>
-Adam Roben <adam@github.com>
-Adam Treat <adam.treat@samsung.com>
-Addanki Gandhi Kishor <kishor.ag@samsung.com>
-Adenilson Cavalcanti <a.cavalcanti@partner.samsung.com>
-Aditya Bhargava <heuristicist@gmail.com>
-Ajay Berwal <ajay.berwal@samsung.com>
-Ajith Kumar V <ajith.v@samsung.com>
-Alex Gartrell <agartrell@cmu.edu>
-Alex Henrie <alexhenrie24@gmail.com>
-Alex Scheele <alexscheele@gmail.com>
-Alexander Sulfrian <alexander@sulfrian.net>
-Alexandre Abreu <wiss1976@gmail.com>
-Alexandru Chiculita <achicu@adobe.com>
-Alexey Korepanov <alexkorep@gmail.com>
-Alexis Menard <alexis.menard@intel.com>
-Alfredo Hernandez <ahernandez.miralles@gmail.com>
-Ali Vathi <ali.akbar@gmail.com>
-Amit Sarkar <amit.srkr@samsung.com>
-Amogh Bihani <amogh.bihani@samsung.com>
-Amruth Raj <amruthraj@motorola.com>
-Amruth Raj <ckqr36@motorola.com>
-Anand Ratn <anand.ratn@samsung.com>
-Anastasios Cassiotis <tom.cassiotis@gmail.com>
-Ancil George <ancilgeorge@samsung.com>
-Andrei Parvu <andrei.prv@gmail.com>
-Andrei Parvu <parvu@adobe.com>
-Andrew Brampton <me@bramp.net>
-Andrew Tulloch <andrew@tullo.ch>
-Anish Patankar <anish.p@samsung.com>
-Ankit Kumar <ankit2.kumar@samsung.com>
-Anssi Hannula <anssi.hannula@iki.fi>
-Antonio Gomes <a1.gomes@sisa.samsung.com>
-Anuj Kumar Sharma <anujk.sharma@samsung.com>
-Arnaud Renevier <a.renevier@samsung.com>
-Arpita Bahuguna <a.bah@samsung.com>
-Arthur Lussos <developer0420@gmail.com>
-Arun Kulkarni <kulkarni.a@samsung.com>
-Arun Mankuzhi <arun.m@samsung.com>
-Arunoday Sarkar <a.sarkar.arun@gmail.com>
-Arunprasad Rajkumar <ararunprasad@gmail.com>
-Attila Dusnoki <dati91@gmail.com>
-Avinaash Doreswamy <avi.nitk@samsung.com>
-Balazs Kelemen <b.kelemen@samsung.com>
-Behara Mani Shyam Patro <behara.ms@samsung.com>
-Bem Jones-Bey <bemajaniman@gmail.com>
-Bem Jones-Bey <bjonesbe@adobe.com>
-Ben Karel <eschew@gmail.com>
-Benjamin Jemlich <pcgod99@gmail.com>
-Bernard Cafarelli <voyageur@gentoo.org>
-Bobby Powers <bobbypowers@gmail.com>
-Brendan Long <self@brendanlong.com>
-Brian G. Merrell <bgmerrell@gmail.com>
-Brian Konzman, SJ <b.g.konzman@gmail.com>
-Brian Merrell, Novell Inc. <bgmerrell@gmail.com>
-Bruno Calvignac <bruno@flock.com>
-Bruno de Oliveira Abinader <bruno.d@partner.samsung.com>
-Bryan Donlan <bdonlan@gmail.com>
-Byungwoo Lee <bw80.lee@samsung.com>
-Caio Marcelo de Oliveira Filho <caio.de.oliveira.filho@intel.com>
-Caitlin Potter <caitpotter88@gmail.com>
-Catalin Badea <badea@adobe.com>
-Cem Kocagil <cem.kocagil@gmail.com>
-Chamal De Silva <chamalsl@yahoo.com>
-Chandra Shekar Vallala <brk376@motorola.com>
-Chang Shu <c.shu@samsung.com>
-ChangSeok Oh <shivamidow@gmail.com>
-Changbin Shao <changbin.shao@intel.com>
-Changjun Yang <changjun.yang@intel.com>
-Chansik Yun <chansik.yun@gmail.com>
-Chaobin Zhang <zhchbin@gmail.com>
-Chris Harrelson <chrishtr@gmail.com>
-Christophe Dumez <ch.dumez@samsung.com>
-Christopher Dale <chrelad@gmail.com>
-Clemens Fruhwirth <clemens@endorphin.org>
-Clement Scheelfeldt Skau <clementskau@gmail.com>
-Clinton Staley <clintstaley@chromium.org>
-Clinton Staley <clintstaley@gmail.com>
-Craig Schlenter <craig.schlenter@gmail.com>
-Daegyu Lee <na7jun8gi@gmail.com>
-Dai Chunyang <chunyang.dai@intel.com>
-Daniel Bomar <dbdaniel42@gmail.com>
-Daniel Johnson <danielj41@gmail.com>
-Daniel Nishi <dhnishi@gmail.com>
-Daniel Shaulov <dshaulov@ptc.com>
-Daniel Trebbien <dtrebbien@gmail.com>
-David Benjamin <davidben@mit.edu>
-David Erceg <erceg.david@gmail.com>
-David Futcher <david.mike.futcher@gmail.com>
-Deepak Mittal <deepak.m1@samsung.com>
-Deepak Singla <deepak.sa@samsung.com>
-Derek Halman <d.halman@gmail.com>
-Devlin Cronin <rdevlin.cronin@gmail.com>
-Diego Ferreiro Val <elfogris@gmail.com>
-Dillon Sellars <dill.sellars@gmail.com>
-Divya Bansal <divya.bansal@samsung.com>
-Dominic Jodoin <dominic.jodoin@gmail.com>
-Dominik Röttsches <dominik.rottsches@intel.com>
-Don Woodward <woodward@adobe.com>
-Dongjun Kim <djmix.kim@samsung.com>
-Dongseong Hwang <dongseong.hwang@intel.com>
-Dongwoo Joshua Im <dw.im@samsung.com>
-Douglas F. Turner <doug.turner@gmail.com>
-Eduardo Lima (Etrunko) <eduardo.lima@intel.com>
-Edward Crossman <tedoc2000@gmail.com>
-Eero Häkkinen <e.hakkinen@samsung.com>
-Egor Starkov <egor.starkov@samsung.com>
-Ehsan Akhgari <ehsan.akhgari@gmail.com>
-Elan Ruusamäe <elan.ruusamae@gmail.com>
-Eric Ahn <byungwook.ahn@gmail.com>
-Eric Rescorla <ekr@rtfm.com>
-Erik Hill <erikghill@gmail.com>
-Erik Sjölund <erik.sjolund@gmail.com>
-Eriq Augustine <eriq.augustine@gmail.com>
-Etienne Laurin <etienne@atnnn.com>
-Evan Peterson <evan.peterson.ep@gmail.com>
-Evan Wallace <evan.exe@gmail.com>
-Evangelos Foutras <evangelos@foutrelis.com>
-Evgeniy Dushistov <dushistov@gmail.com>
-Fabien Tassin <fta@sofaraway.org>
-Felix H. Dahlke <fhd@ubercode.de>
-Fernando Jiménez Moreno <ferjmoreno@gmail.com>
-François Beaufort <beaufort.francois@gmail.com>
-Francois Kritzinger <francoisk777@gmail.com>
-Frédéric Wang <fred.wang@free.fr>
-Gaetano Mendola <mendola@gmail.com>
-Gajendra N <gajendra.n@samsung.com>
-Gajendra Singh <wxjg68@motorola.com>
-Gao Chun <chun.gao@intel.com>
-Gao Chun <gaochun.dev@gmail.com>
-George Liaskos <geo.liaskos@gmail.com>
-Giuseppe Iuculano <giuseppe@iuculano.it>
-Glenn Adams <glenn@chromium.org>
-Gnanasekar Somanathan <gnanasekar.s@samsung.com>
-Gordana Cmiljanovic <gordana.cmiljanovic@imgtec.com>
-Goutham Jagannatha <wrm364@motorola.com>
-Gregory Davis <gpdavis.chromium@gmail.com>
-Grzegorz Czajkowski <g.czajkowski@samsung.com>
-Guangzhen Li <guangzhen.li@intel.com>
-Gurpreet Kaur <k.gurpreet@samsung.com>
-Gyuyoung Kim <gyuyoung.kim@samsung.com>
-Habib Virji <habib.virji@samsung.com>
-Haitao Feng <haitao.feng@intel.com>
-Halton Huo <halton.huo@intel.com>
-Haojian Wu <hokein.wu@gmail.com>
-Harpreet Singh Khurana <harpreet.sk@samsung.com>
-Hautio Kari <khautio@gmail.com>
-Heejin R. Chung <heejin.r.chung@samsung.com>
-Heeyoun Lee <heeyoun.lee@samsung.com>
-Himanshu Joshi <h.joshi@samsung.com>
-Hong Zheng <hong.zheng@intel.com>
-Hongbo Min <hongbo.min@intel.com>
-Horia Olaru <horia.olaru@gmail.com>
-Horia Olaru <olaru@adobe.com>
-Hosung You <hosung.you@samsung.com>
-Hwanseung Lee <rucifer1217@gmail.com>
-Hyunki Baik <hyunki.baik@samsung.com>
-Hyungwook Lee <withlhw@gmail.com>
-Ibrar Ahmed <ibrar.ahmad@gmail.com>
-Ion Rosca <rosca@adobe.com>
-J. Ryan Stinnett <jryans@chromium.org>
-Jacob Mandelson <jacob@mandelson.org>
-Jaehun Lim <ljaehun.lim@samsung.com>
-Jaekyeom Kim <btapiz@gmail.com>
-Jaime Soriano Pastor <jsorianopastor@gmail.com>
-Jake Helfert <jake@helfert.us>
-Jakob Weigert <jakob.j.w@googlemail.com>
-James Choi <jchoi42@pha.jhu.edu>
-James Vega <vega.james@gmail.com>
-James Wei <james.wei@intel.com>
-James Willcox <jwillcox@litl.com>
-Janwar Dinata <j.dinata@gmail.com>
-Jared Shumway <jaredshumway94@gmail.com>
-Jared Wein <weinjared@gmail.com>
-Jay Soffian <jaysoffian@gmail.com>
-Jeado Ko <haibane84@gmail.com>
-Jeongeun Kim <je_julie.kim@samsung.com>
-Jesse Miller <jesse@jmiller.biz>
-Jesus Sanchez-Palencia <jesus.sanchez-palencia.fernandez.fil@intel.com>
-Jiajia Qin <jiajia.qin@intel.com>
-Jie Chen <jie.a.chen@intel.com>
-Jihun Brent Kim <devgrapher@gmail.com>
-Jin Yang <jin.a.yang@intel.com>
-Jincheol Jo <jincheol.jo@navercorp.com>
-Jingwei Liu <kingweiliu@gmail.com>
-Jingyi Wei <wjywbs@gmail.com>
-Jinho Bang <jinho.bang@samsung.com>
-Jinwoo Song <jinwoo7.song@samsung.com>
-Jitendra Kumar Sahoo <jitendra.ks@samsung.com>
-Joe Knoll <joe.knoll@workday.com>
-Joe Thomas <mhx348@motorola.com>
-Joel Stanley <joel@jms.id.au>
-Johannes Rudolph <johannes.rudolph@googlemail.com>
-John Yani <vanuan@gmail.com>
-John Yoo <nearbyh13@gmail.com>
-Jonathan Frazer <listedegarde@gmail.com>
-Jonathan Hacker <jhacker@arcanefour.com>
-Jongsoo Lee <leejongsoo@gmail.com>
-Joone Hur <joone.hur@intel.com>
-Jorge Villatoro <jorge@tomatocannon.com>
-Joseph Gentle <josephg@gmail.com>
-Josh Triplett <josh@joshtriplett.org>
-Josh Triplett <josh.triplett@intel.com>
-Joshua Lock <joshua.lock@intel.com>
-Joshua Roesslein <jroesslein@gmail.com>
-Josué Ratelle <jorat1346@gmail.com>
-Juhui Lee <juhui24.lee@samsung.com>
-Julien Racle <jracle@logitech.com>
-Jun Jiang <jun.a.jiang@intel.com>
-JungJik Lee <jungjik.lee@samsung.com>
-Junmin Zhu <junmin.zhu@intel.com>
-Kal Conley <kcconley@gmail.com>
-Kalyan Kondapally <kalyan.kondapally@intel.com>
-Kamil Jiwa <kamil.jiwa@gmail.com>
-Kangil Han <kangil.han@samsung.com>
-Kangyuan Shu <kangyuan.shu@intel.com>
-Kaspar Brand <googlecontrib@velox.ch>
-Kaustubh Atrawalkar <kaustubh.ra@gmail.com>
-Kaustubh Atrawalkar <kaustubh.a@samsung.com>
-Keene Pan <keenepan@linpus.com>
-Kenneth Rohde Christiansen <kenneth.r.christiansen@intel.com>
-Keonho Kim <keonho07.kim@samsung.com>
-Kevin Lee Helpingstine <sig11@reprehensible.net>
-Kevin M. McCormick <mckev@amazon.com>
-Kihong Kwon <kihong.kwon@samsung.com>
-Kim Christensen <kimworking@gmail.com>
-Kingshuk Jana <kingshuk.j@samsung.com>
-Klemen Forstnerič <klemen.forstneric@gmail.com>
-Krzysztof Wolanski <k.wolanski@samsung.com>
-Kunal Thakar <kunalt@gmail.com>
-Kushal Pisavadia <kushi.p@gmail.com>
-Kwangho Shin <k_h.shin@samsung.com>
-Kyle Nahrgang <kpn24@drexel.edu>
-Kyungtae Kim <ktf.kim@samsung.com>
-Kyung Yeol Kim <chitacan@gmail.com>
-Laszlo Gombos <l.gombos@samsung.com>
-Laszlo Radanyi <bekkra@gmail.com>
-Lauren Yeun Kim <lauren.yeun.kim@gmail.com>
-Lauri Oherd <lauri.oherd@gmail.com>
-Leith Bade <leith@leithalweapon.geek.nz>
-Li Yin <li.yin@intel.com>
-Lionel Landwerlin <lionel.g.landwerlin@intel.com>
-Lorenzo Stoakes <lstoakes@gmail.com>
-Lu Guanqun <guanqun.lu@gmail.com>
-Lucie Brozkova <lucinka.brozkova@gmail.com>
-Luke Inman-Semerau <luke.semerau@gmail.com>
-Luke Zarko <lukezarko@gmail.com>
-Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Magnus Danielsson <fuzzac@gmail.com>
-Mahesh Kulkarni <mahesh.kk@samsung.com>
-Malcolm Wang <malcolm.2.wang@gmail.com>
-Manish Chhajer <chhajer.m@samsung.com>
-Manuel Braun <thembrown@gmail.com>
-Mao Yujie <maojie0924@gmail.com>
-Mao Yujie <yujie.mao@intel.com>
-Marco Rodrigues <gothicx@gmail.com>
-Mario Sanchez Prada <mario.prada@samsung.com>
-Mark Hahnenberg <mhahnenb@andrew.cmu.edu>
-Mark Seaborn <mrs@mythic-beasts.com>
-Martin Bednorz <m.s.bednorz@gmail.com>
-Masahiro Yado <yado.masa@gmail.com>
-Matheus Bratfisch <matheusbrat@gmail.com>
-Mathias Bynens <mathias@qiwi.be>
-Matt Arpidone <mma.public@gmail.com>
-Matthew Robertson <matthewrobertson03@gmail.com>
-Matthew Turk <matthewturk@gmail.com>
-Matthew Willis <appamatto@gmail.com>
-Matthias Reitinger <reimarvin@gmail.com>
-Max Perepelitsyn <pph34r@gmail.com>
-Max Vujovic <mvujovic@adobe.com>
-Michael Gilbert <floppymaster@gmail.com>
-Michael Schechter <mike.schechter@gmail.com>
-Michael Zugelder <michael@zugelder.org>
-Mihai Maerean <mmaerean@adobe.com>
-Mihai Tica <mihai.o.tica@gmail.com>
-Mihai Tica <mitica@adobe.com>
-Mike Tilburg <mtilburg@adobe.com>
-Mikhail Pozdnyakov <mikhail.pozdnyakov@intel.com>
-Mingmin Xie <melvinxie@gmail.com>
-Mirela Budaes <mbudaes@gmail.com>
-Mirela Budaes <mbudaes@adobe.com>
-Mitchell Rosen <mitchellwrosen@chromium.org>
-Miyoung Shin <myid.shin@samsung.com>
-Mohamed I. Hammad <ibraaaa@gmail.com>
-Mohamed Mansour <m0.interactive@gmail.com>
-Mohammed Wajahat Ali Siddiqui <wajahat.s@samsung.com>
-Mohan Reddy <mohan.reddy@samsung.com>
-Mrunal Kapade <mrunal.kapade@intel.com>
-Myles C. Maxfield <mymax@amazon.com>
-Naiem Shaik <naiem.shaik@gmail.com>
-Naoki Takano <takano.naoki@gmail.com>
-Naveen Bobbili <naveenbobbili@motorola.com>
-Naveen Bobbili <qghc36@motorola.com>
-Naveen Kumar S G <naveensg@samsung.com>
-Nayan Kumar K <qtc746@motorola.com>
-Nedeljko Babic <nedeljko.babic@imgtec.com>
-Nikhil Bansal <n.bansal@samsung.com>
-Nikita Ofitserov <himikof@gmail.com>
-Ningxin Hu <ningxin.hu@intel.com>
-Nitish Mehrotra <nitish.m@samsung.com>
-Pan Deng <pan.deng@intel.com>
-Parag Radke <nrqv63@motorola.com>
-Patrasciuc Sorin Cristian <cristian.patrasciuc@gmail.com>
-Patrick Riordan <patrickriordan177@gmail.com>
-Paul Adolph <padolph@netflix.com>
-Paul Kehrer <paul.l.kehrer@gmail.com>
-Paul Lind <paul.lind@imgtec.com>
-Paul Nettleship <pnettleship@gmail.com>
-Paul Robinson <paulrobinson85@googlemail.com>
-Paul Roskell <blurrech@gmail.com>
-Paul Wicks <pwicks86@gmail.com>
-Pavan Kumar Emani <pavan.e@samsung.com>
-Pavel Ivanov <paivanof@gmail.com>
-Paweł Hajdan jr <phajdan.jr@gmail.com>
-Peng Jiang <leiyi.jp@gmail.com>
-Petar Jovanovic <petarj@mips.com>
-Peter Beverloo <peter@chromium.org>
-Peter Bright <drpizza@quiscalusmexicanus.org>
-Peter Brophy <pbrophy@adobe.com>
-Peter Collingbourne <peter@pcc.me.uk>
-Peter Gal <pgal.u-szeged@partner.samsung.com>
-Philippe Beauchamp <philippe.beauchamp@gmail.com>
-Philippe Beaudoin <philippe.beaudoin@gmail.com>
-Pierre-Antoine LaFayette <pierre.lafayette@gmail.com>
-Po-Chun Chang <pochang0403@gmail.com>
-Prashant Nevase <prashant.n@samsung.com>
-Pritam Nikam <pritam.nikam@samsung.com>
-Puttaraju R <puttaraju.r@samsung.com>
-Qiankun Miao <qiankun.miao@intel.com>
-Qing Zhang <qing.zhang@intel.com>
-Radu Stavila <stavila@adobe.com>
-Raghavendra Ghatage <r.ghatage@samsung.com>
-Raman Tenneti <raman.tenneti@gmail.com>
-Ramkumar Gokarnesan <ramkumar.gokarnesan@gmail.com>
-Ramkumar Ramachandra <artagnon@gmail.com>
-Randy Posynick <randy.posynick@gmail.com>
-Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Ravi Phaneendra Kasibhatla <r.kasibhatla@samsung.com>
-Ravi Phaneendra Kasibhatla <ravi.kasibhatla@motorola.com>
-Renata Hodovan <rhodovan.u-szeged@partner.samsung.com>
-Rene Bolldorf <rb@radix.io>
-Rene Ladan <r.c.ladan@gmail.com>
-Rijubrata Bhaumik <rijubrata.bhaumik@intel.com>
-Rob Buis <rob.buis@samsung.com>
-Rob Wu <rob@robwu.nl>
-Robert Bear Travis <bear.travis@gmail.com>
-Robert Bear Travis <betravis@adobe.com>
-Robert Bradford <robert.bradford@intel.com>
-Robert Goldberg <goldberg@adobe.com>
-Robert Hogan <robhogan@gmail.com>
-Robert Nagy <robert.nagy@gmail.com>
-Robert Sesek <rsesek@bluestatic.org>
-Roland Takacs <rtakacs.u-szeged@partner.samsung.com>
-Rosen Dash <nqk836@motorola.com>
-Rosen Dash <rosen.dash@gmail.com>
-ruben <chromium@hybridsource.org>
-Ruben Terrazas <rubentopo@gmail.com>
-Ruiyi Luo <luoruiyi2008@gmail.com>
-Ryan Norton <rnorton10@gmail.com>
-Ryan Sleevi <ryan-chromium-dev@sleevi.com>
-Ryuan Choi <ryuan.choi@samsung.com>
-Saikrishna Arcot <saiarcot895@gmail.com>
-Salvatore Iovene <salvatore.iovene@intel.com>
-Sam Larison <qufighter@gmail.com>
-Sam McDonald <sam@sammcd.com>
-Sanjoy Pal <ncj674@motorola.com>
-Sanjoy Pal <sanjoy.pal@samsung.com>
-Sanne Wouda <sanne.wouda@gmail.com>
-Sarath Singapati <s.singapati@samsung.com>
-Sathish Kuppuswamy <sathish.kuppuswamy@intel.com>
-Satoshi Matsuzaki <satoshi.matsuzaki@gmail.com>
-Sayan Nayak <sayan.nayak@samsung.com>
-Scott Blomquist <sblom@microsoft.com>
-Sean Bryant <sean@cyberwang.net>
-Seo Sanghyeon <sanxiyn@gmail.com>
-Seokju Kwon <seokju.kwon@gmail.com>
-Sergey Putilin <p.sergey@samsung.com>
-Sergio Carlos Morales Angeles <carloschilazo@gmail.com>
-Sergiy Byelozyorov <rryk.ua@gmail.com>
-Seshadri Mahalingam <seshadri.mahalingam@gmail.com>
-Sevan Janiyan <venture37@geeklan.co.uk>
-ShankarGanesh K <blr.bmlab@gmail.com>
-Shez Baig <sbaig1@bloomberg.net>
-Shiliu Wang <aofdwsl@gmail.com>
-Shiliu Wang <shiliu.wang@intel.com>
-Shouqun Liu <shouqun.liu@intel.com>
-Shreeram Kushwaha <shreeram.k@samsung.com>
-Shreyas Gopal <shreyas.g@samsung.com>
-Shreyas VA <v.a.shreyas@gmail.com>
-Siba Samal <siba.samal@samsung.com>
-Simon Arlott <simon.arlott@gmail.com>
-Siva Kumar Gunturi <siva.gunturi@samsung.com>
-Sohan Jyoti Ghosh <sohan.jyoti@samsung.com>
-Song YeWen <ffmpeg@gmail.com>
-Soren Dreijer <dreijerbit@gmail.com>
-Srirama Chandra Sekhar Mogali <srirama.m@samsung.com>
-Stephen Searles <stephen.searles@gmail.com>
-Steven Pennington <spenn@engr.uvic.ca>
-Subrahmanya Praveen Munukutla <sataya.m@samsung.com>
-Suchit Agrawal <a.suchit@samsung.com>
-Sudarsana Babu Nagineni <sudarsana.nagineni@intel.com>
-Sudarshan Parthasarathy <sudarshan.p@samsung.com>
-Sungguk Lim <limasdf@gmail.com>
-Sungmann Cho <sungmann.cho@gmail.com>
-Sungmann Cho <sungmann.cho@navercorp.com>
-Suyash Sengar <suyash.s@samsung.com>
-Sunil Ratnu <sunil.ratnu@samsung.com>
-Sylvain Zimmer <sylvinus@gmail.com>
-Szymon Piechowicz <szymonpiechowicz@o2.pl>
-Takeshi Kurosawa <taken.spc@gmail.com>
-Tapu Kumar Ghose <ghose.tapu@gmail.com>
-Taylor Price <trprice@gmail.com>
-Ted Kim <neot0000@gmail.com>
-Ted Vessenes <tedvessenes@gmail.com>
-Teodora Novkovic <teodora.petrovic@gmail.com>
-Thiago Farina <thiago.farina@gmail.com>
-Thiago Marcos P. Santos <thiago.santos@intel.com>
-Thomas Butter <tbutter@gmail.com>
-Tiago Vignatti <tiago.vignatti@intel.com>
-Tim Ansell <mithro@mithis.com>
-Timo Reimann <ttr314@googlemail.com>
-Torsten Kurbad <google@tk-webart.de>
-Trevor Perrin <unsafe@trevp.net>
-Umar Hansa <umar.hansa@gmail.com>
-Vamshikrishna Yellenki <vamshi@motorola.com>
-Vani Hegde <vani.hegde@samsung.com>
-Vedran Šajatović <vedran.sajatovic@gmail.com>
-Vernon Tang <vt@foilhead.net>
-Viatcheslav Ostapenko <sl.ostapenko@samsung.com>
-Victor Costan <costan@gmail.com>
-Viet-Trung Luu <viettrungluu@gmail.com>
-Vinay Anantharaman <vinaya@adobe.com>
-Vipul Bhasin <vipul.bhasin@gmail.com>
-Vivek Galatage <vivek.vg@samsung.com>
-Will Hirsch <chromium@willhirsch.co.uk>
-Xiang Long <xiang.long@intel.com>
-Xinchao He <hexinchao@gmail.com>
-Xu Samuel <samuel.xu@intel.com>
-Xuefei Ren <xrenishere@gmail.com>
-Yael Aharon <yael.aharon@intel.com>
-Yair Yogev <progame@chromium.org>
-Yang Gu <yang.gu@intel.com>
-Yarin Kaul <yarin.kaul@gmail.com>
-Ye Liu <cbakgly@gmail.com>
-Yi Shen <yi.shen@samsung.com>
-Yoav Weiss <yoav@yoav.ws>
-Yoav Zilberberg <yoav.zilberberg@gmail.com>
-Yong Shin <sy3620@gmail.com>
-Yongsheng Zhu <yongsheng.zhu@intel.com>
-Yoshinori Sano <yoshinori.sano@gmail.com>
-YoungKi Hong <simon.hong81@gmail.com>
-Youngsun Suh <zard17@gmail.com>
-Yumikiyo Osanai <yumios.art@gmail.com>
-Yuri Gorobets <yuri.gorobets@gmail.com>
-Zeno Albisser <zeno.albisser@digia.com>
-Zhaoze Zhou <zhaoze.zhou@partner.samsung.com>
-Zheng Chuang <zhengchuangscu@gmail.com>
-Zhenyu Liang <zhenyu.liang@intel.com>
-Zhenyu Shan <zhenyu.shan@intel.com>
-Ziran Sun <ziran.sun@samsung.com>
-Yongha Lee <yongha78.lee@samsung.com>
-方觉 (Fang Jue) <fangjue23303@gmail.com>
-Yupei Wang <perryuwang@tencent.com>
-Peng Hu <penghu@tencent.com>
-WenSheng He <wensheng.he@samsung.com>
-
-BlackBerry Limited <*@blackberry.com>
-Code Aurora Forum <*@codeaurora.org>
-Comodo CA Limited
-Google Inc. <*@google.com>
-Igalia S.L. <*@igalia.com>
-NVIDIA Corporation <*@nvidia.com>
-Opera Software ASA <*@opera.com>
-The Chromium Authors <*@chromium.org>
-The MathWorks, Inc. <binod.pant@mathworks.com>
-Torchmobile Inc.
-Venture 3 Systems LLC <*@venture3systems.com>
-Yandex LLC <*@yandex-team.ru>
-ARM Holdings <*@arm.com>
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 4871185..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,73 +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.
-
-# This Android makefile is used to build WebView in the Android build system.
-# gyp autogenerates most of the real makefiles, which we include below.
-
-# Don't do anything if the product is using a prebuilt webviewchromium, to avoid
-# duplicate target definitions between this directory and the prebuilts.
-ifneq ($(PRODUCT_PREBUILT_WEBVIEWCHROMIUM),yes)
-
-CHROMIUM_DIR := $(call my-dir)
-
-# We default to release for the Android build system. Developers working on
-# WebView code can build with "make GYP_CONFIGURATION=Debug".
-GYP_CONFIGURATION := Release
-
-# Include the manually-written makefile that builds all the WebView java code.
-include $(CHROMIUM_DIR)/android_webview/Android.mk
-
-# If the gyp-generated makefile exists for the current host OS and primary
-# target architecture, we need to include it. If it doesn't exist then just do
-# nothing, since we may not have finished bringing up this architecture yet.
-ifneq (,$(wildcard $(CHROMIUM_DIR)/GypAndroid.$(HOST_OS)-$(TARGET_ARCH).mk))
-
-# We set GYP_VAR_PREFIX to the empty string to indicate that we are building for
-# the primary target architecture.
-GYP_VAR_PREFIX :=
-
-# If the host is declared as being 64-bit, set the host multilib variables
-# appropriately to ensure that the host targets are the same "bitness" as the
-# primary target, which is required by V8.
-ifeq ($(HOST_IS_64_BIT),true)
-ifeq ($(TARGET_IS_64_BIT),true)
-GYP_HOST_VAR_PREFIX :=
-GYP_HOST_MULTILIB := 64
-else  # Target is 32-bit.
-GYP_HOST_VAR_PREFIX := $(HOST_2ND_ARCH_VAR_PREFIX)
-GYP_HOST_MULTILIB := 32
-endif
-endif
-
-include $(CHROMIUM_DIR)/GypAndroid.$(HOST_OS)-$(TARGET_ARCH).mk
-
-endif  # End primary architecture handling.
-
-# Do the same check for the secondary architecture; if this doesn't exist then
-# the current target platform probably doesn't have a secondary architecture and
-# we can just do nothing.
-ifneq (,$(wildcard $(CHROMIUM_DIR)/GypAndroid.$(HOST_OS)-$(TARGET_2ND_ARCH).mk))
-
-# We set GYP_VAR_PREFIX to $(TARGET_2ND_ARCH_VAR_PREFIX) to indicate that we are
-# building for the secondary target architecture.
-GYP_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)
-
-# If the host is declared as being 64-bit, set the host multilib variables
-# appropriately to ensure that the host targets are the same "bitness" as the
-# secondary target, which is required by V8.
-ifeq ($(HOST_IS_64_BIT),true)
-ifeq ($(2ND_TARGET_IS_64_BIT),true)
-GYP_HOST_VAR_PREFIX :=
-GYP_HOST_MULTILIB := 64
-else  # Second target is 32-bit.
-GYP_HOST_VAR_PREFIX := $(HOST_2ND_ARCH_VAR_PREFIX)
-GYP_HOST_MULTILIB := 32
-endif
-endif
-
-include $(CHROMIUM_DIR)/GypAndroid.$(HOST_OS)-$(TARGET_2ND_ARCH).mk
-
-endif  # End secondary architecture handling.
-
-endif
diff --git a/BUILD.gn b/BUILD.gn
deleted file mode 100644
index 85531ca..0000000
--- a/BUILD.gn
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright (c) 2013 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 is the root build file for GN. GN will start processing by loading this
-# file, and recursively load all dependencies until all dependencies are either
-# resolved or known not to exist (which will cause the build to fail). So if
-# you add a new build file, there must be some path of dependencies from this
-# file to your new one or GN won't know about it.
-
-import("//build/config/ui.gni")
-
-# In GN, a "group" is a dummy target that just lists other targets.
-group("root") {
-  # This should not be linked into production and depends on test targets.
-  testonly = true
-
-  # Note that some dependencies are commented out. These are things that are
-  # currently written but not hooked up to the build yet. They may need to be
-  # completed or possibly just tested and then re-enabled.
-  deps = [
-    "//apps",
-    "//ash",
-    "//cc",
-    "//cc/blink",
-    "//chrome/browser",
-    "//chrome/browser/devtools",
-    "//chrome/browser/ui",
-    "//chrome/browser/ui/views",
-    "//chrome/common",
-    "//chrome/plugin",
-    "//chrome/renderer",
-    "//chrome/service",
-    "//chrome/utility",
-    "//components:all_components",
-    "//content",
-    "//content/shell:content_shell",
-    "//content/test:test_support",
-    "//crypto",
-    "//device/bluetooth",
-    "//device/nfc",
-    "//extensions/browser",
-    "//extensions/common",
-    "//extensions/common/api",
-    "//extensions/renderer",
-    "//gin",
-    "//gpu",
-    "//google_apis",
-    "//google_apis/gcm",
-    "//ipc",
-    "//ipc/mojo",
-    "//jingle:notifier",
-    "//media",
-    "//media/blink",
-    "//media/cast",
-    "//mojo",
-    "//net",
-    "//pdf",
-    "//ppapi:ppapi_c",
-    "//printing",
-    "//remoting/client/plugin",
-    "//sandbox",
-    "//sdch",
-    "//skia",
-    "//storage/browser",
-    "//sql",
-    "//sync",
-    "//third_party/WebKit/public:all_blink",
-    "//third_party/angle:translator",
-    "//third_party/brotli",
-    "//third_party/cacheinvalidation",
-    "//third_party/cld",
-    "//third_party/cld_2",
-    "//third_party/ffmpeg",
-    "//third_party/flac",
-    "//third_party/harfbuzz-ng",
-    "//third_party/hunspell",
-    "//third_party/iccjpeg",
-    "//third_party/icu",
-    "//third_party/leveldatabase",
-    "//third_party/libaddressinput",
-    "//third_party/libphonenumber",
-    "//third_party/libjingle",
-    "//third_party/libpng",
-    "//third_party/libsrtp",
-    "//third_party/libusb",
-    "//third_party/libwebm",
-    "//third_party/libwebp",
-    "//third_party/libxslt",
-    "//third_party/libyuv",
-    "//third_party/lzma_sdk",
-    "//third_party/mesa",
-    "//third_party/opus",
-    "//third_party/ots",
-    "//third_party/protobuf:protobuf_lite",
-    "//third_party/qcms",
-    "//third_party/re2",
-    "//third_party/smhasher:cityhash",
-    "//third_party/smhasher:murmurhash3",
-    "//third_party/smhasher:pmurhash",
-    "//third_party/snappy",
-    "//third_party/speex",
-    "//third_party/usrsctp",
-    "//third_party/widevine/cdm:version_h",
-    "//third_party/webrtc",
-    "//third_party/zlib",
-    "//third_party:jpeg",
-    "//tools/gn",
-    "//tools/imagediff($host_toolchain)",
-    "//ui/accessibility",
-    "//ui/app_list",
-    "//ui/aura",
-    "//ui/base",
-    "//ui/display",
-    "//ui/events",
-    "//ui/gfx",
-    "//ui/gl",
-    "//ui/keyboard",
-    "//ui/native_theme",
-    "//ui/resources",
-    "//ui/snapshot",
-    "//ui/strings",
-    "//ui/surface",
-    "//ui/views",
-    "//ui/views/controls/webview",
-    "//ui/web_dialogs",
-    "//url",
-    "//v8:v8",
-  ]
-
-  if (!is_win) {
-    deps += [ "//breakpad:symupload" ]
-  }
-
-  if (is_linux) {
-    deps += [
-      "//dbus",
-      "//third_party/fontconfig",
-      "//third_party/freetype2",
-    ]
-  }
-
-  if (use_x11) {
-    deps += [ "//tools/xdisplaycheck" ]
-  }
-
-  if (use_aura) {
-    deps += [ "//ui/wm" ]
-  }
-
-  if (is_win) {
-    deps += [
-      "//ui/metro_viewer",
-    ]
-  }
-
-  if (is_win || is_mac || is_chromeos) {
-    # RLZ works on these platforms.
-    deps += [
-      "//rlz:rlz_lib",
-    ]
-  }
-
-  if (cpu_arch == "x86" || cpu_arch == "x64") {
-    # YASM is x86/x64 only.
-    deps += [ "//third_party/yasm($host_toolchain)" ]
-  }
-
-  if (is_android) {
-    deps += [
-      "//content/shell/android:content_shell_apk",
-      "//ui/android:ui_java",
-      "//third_party/guava:guava_javalib",
-      "//third_party/android_tools:android_gcm_java",
-      "//third_party/android_tools:uiautomator_java",
-      "//third_party/android_tools:android_support_v13_java",
-      "//third_party/android_tools:android_support_v7_appcompat_java",
-      "//third_party/android_tools:android_support_v7_mediarouter_java",
-      "//third_party/eyesfree:eyesfree_java",
-    ]
-
-    deps -= [
-      "//apps",  # Needs testing.
-      "//chrome/browser",  # Blocked on content.
-      "//chrome/browser/devtools",  # Blocked on content.
-      "//chrome/browser/ui",  # Blocked on content.
-      "//chrome/browser/ui/views",  # Blocked on content.
-      "//chrome/common",  # Blocked on content.
-      "//chrome/plugin",  # Blocked on content.
-      "//chrome/renderer",  # Blocked on content.
-      "//chrome/service",  # Blocked on content.
-      "//chrome/utility",  # Blocked on content.
-      "//content/shell:content_shell",
-      "//extensions/browser",
-      "//extensions/common",
-      "//extensions/common/api",
-      "//extensions/renderer",
-      "//pdf",  # Not compiled on Android in GYP yet, either.
-      "//ppapi:ppapi_c",
-      "//third_party/libusb",
-      "//ui/keyboard",  # Blocked on content.
-
-      # Seems to not be compiled on Android. Otherwise it will need a config.h.
-      "//third_party/libxslt",
-
-      # Not relevant to Android.
-      "//ash",
-      "//tools/gn",
-      "//ui/aura",
-      "//ui/display",
-      "//ui/views",
-      "//ui/views/controls/webview",
-
-      # Fails on Android for unknown reasons.
-      "//third_party/flac",
-      "//breakpad:symupload",
-
-      # Not tested on Android yet:
-      "//google_apis/gcm",
-      "//remoting/client/plugin",
-      "//storage/browser",
-      "//third_party/cld_2",
-      "//third_party/libaddressinput",
-      "//third_party/ffmpeg",
-      "//ui/app_list",
-      "//ui/web_dialogs",
-    ]
-  }
-
-  if (use_ozone) {
-    deps += [
-      "//ui/ozone",
-      "//ui/ozone/demo",
-    ]
-  }
-
-  # Non-mobile builds.
-  if (!is_android && !is_ios) {
-    deps += [
-      "//device/usb",
-    ]
-  }
-}
diff --git a/DEPS b/DEPS
deleted file mode 100644
index 3048ad0..0000000
--- a/DEPS
+++ /dev/null
@@ -1,801 +0,0 @@
-# This file is automatically processed to create .DEPS.git which is the file
-# that gclient uses under git.
-#
-# See http://code.google.com/p/chromium/wiki/UsingGit
-#
-# To test manually, run:
-#   python tools/deps2git/deps2git.py -o .DEPS.git -w <gclientdir>
-# where <gcliendir> is the absolute path to the directory containing the
-# .gclient file (the parent of 'src').
-#
-# Then commit .DEPS.git locally (gclient doesn't like dirty trees) and run
-#   gclient sync
-# Verify the thing happened you wanted. Then revert your .DEPS.git change
-# DO NOT CHECK IN CHANGES TO .DEPS.git upstream. It will be automatically
-# updated by a bot when you modify this one.
-#
-# When adding a new dependency, please update the top-level .gitignore file
-# to list the dependency's destination directory.
-
-vars = {
-  # Use this googlecode_url variable only if there is an internal mirror for it.
-  # If you do not know, use the full path while defining your new deps entry.
-  'googlecode_url': 'http://%s.googlecode.com/svn',
-  'sourceforge_url': 'http://svn.code.sf.net/p/%(repo)s/code',
-  'llvm_url': 'http://src.chromium.org/llvm-project',
-  'llvm_git': 'https://llvm.googlesource.com',
-  'libcxx_revision': '48198f9110397fff47fe7c37cbfa296be7d44d3d',
-  'libcxxabi_revision': '4ad1009ab3a59fa7a6896d74d5e4de5885697f95',
-  'webkit_trunk': 'http://src.chromium.org/blink/trunk',
-  'webkit_revision': '191f7180a839d03a8b19dbb03d15701f875ad800', # from svn revision 181957
-  'chromium_git': 'https://chromium.googlesource.com',
-  'chromiumos_git': 'https://chromium.googlesource.com/chromiumos',
-  'pdfium_git': 'https://pdfium.googlesource.com',
-  'skia_git': 'https://skia.googlesource.com',
-  'boringssl_git': 'https://boringssl.googlesource.com',
-  'libvpx_revision': 'd95585fb0ec024f6abd96f7b02e0df58019d46af', # r291859
-  'sfntly_revision': '1bdaae8fc788a5ac8936d68bf24f37d977a13dac',
-  'skia_revision': 'abaef86f2b37d8a939506a2076da07f6db456951',
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling Skia
-  # and V8 without interference from each other.
-  'v8_branch': 'trunk',
-  'v8_revision': '6313e220249748eb26e1ddcee2bbe857fef03b42', # from svn revision 23887
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling WebRTC
-  # and V8 without interference from each other.
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling swarming_client
-  # and whatever else without interference from each other.
-  'swarming_revision': '14b5fd823e2a3f0ac702ae297c8315f55820914c',
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling ANGLE
-  # and whatever else without interference from each other.
-  "angle_revision": "bbffd5562e33a6cf6f6f1bb5be6cfa30df8f36ec",
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling build tools
-  # and whatever else without interference from each other.
-  'buildtools_revision': 'ea4dc0e322f4c4c3784ace03b47de99184c4cb55',
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling PDFIum
-  # and whatever else without interference from each other.
-  'pdfium_revision': '12a9940905825e028bebc0bf8d3eddcc65b1933d',
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling openmax_dl
-  # and whatever else without interference from each other.
-  'openmax_dl_revision': '79e64bc9243e5ff11822434cf39b9fabefff3bfb',
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling BoringSSL
-  # and whatever else without interference from each other.
-  'boringssl_revision': 'a70c75cfc0ca32a43985e3f24d737ca9cafcb910',
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling nss
-  # and whatever else without interference from each other.
-  'nss_revision': '7b5b6ec41cf9105bd6e1c9a5157982f821282a4c',
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling google-toolbox-for-mac
-  # and whatever else without interference from each other.
-  'google_toolbox_for_mac_revision': 'a09526298f9dd1ec49d3b3ac5608d2a257b94cef',
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling lighttpd
-  # and whatever else without interference from each other.
-  'lighttpd_revision': '9dfa55d15937a688a92cbf2b7a8621b0927d06eb',
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling lss
-  # and whatever else without interference from each other.
-  'lss_revision': '952107fa7cea0daaabead28c0e92d579bee517eb',
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling NaCl
-  # and whatever else without interference from each other.
-  'nacl_revision': '7cc5d09d0e9617c63a951b88ca50c473174b89ad', # from svn revision r13739
-}
-
-deps = {
-  'src/breakpad/src':
-   Var('chromium_git') + '/external/google-breakpad/src.git' + '@' + '17f614cd8365f5b78577ffcc237300a970db9813', # from svn revision 1359
-
-  'src/buildtools':
-   Var('chromium_git') + '/chromium/buildtools.git' + '@' +  Var('buildtools_revision'),
-
-  'src/sdch/open-vcdiff':
-   Var('chromium_git') + '/external/open-vcdiff.git' + '@' + '438f2a5be6d809bc21611a94cd37bfc8c28ceb33', # from svn revision 41
-
-  'src/testing/gtest':
-   Var('chromium_git') + '/external/googletest.git' + '@' + '4650552ff637bb44ecf7784060091cbed3252211', # from svn revision 692
-
-  'src/testing/gmock':
-   Var('chromium_git') + '/external/googlemock.git' + '@' + '896ba0e03f520fb9b6ed582bde2bd00847e3c3f2', # from svn revision 485
-
-  'src/third_party/angle':
-   Var('chromium_git') + '/angle/angle.git' + '@' +  Var('angle_revision'),
-
-  'src/third_party/colorama/src':
-   Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
-
-  'src/third_party/trace-viewer':
-   Var('chromium_git') + '/external/trace-viewer.git' + '@' + '28dca0dcd6dd243beb96b2f091a1b78772d5b91d', # from svn revision 1550
-
-  'src/third_party/WebKit':
-   Var('chromium_git') + '/chromium/blink.git' + '@' +  Var('webkit_revision'),
-
-  'src/third_party/icu':
-   Var('chromium_git') + '/chromium/deps/icu52.git' + '@' + '89831135d5f76413fcdd3852f8de7f344b3fa40c', # from svn revision 291781
-
-  'src/third_party/libexif/sources':
-   Var('chromium_git') + '/chromium/deps/libexif/sources.git' + '@' + 'ed98343daabd7b4497f97fda972e132e6877c48a',
-
-  'src/third_party/hunspell':
-   Var('chromium_git') + '/chromium/deps/hunspell.git' + '@' + 'c956c0e97af00ef789afb2f64d02c9a5a50e6eb1',
-
-  'src/third_party/hunspell_dictionaries':
-   Var('chromium_git') + '/chromium/deps/hunspell_dictionaries.git' + '@' + '4560bdd463a3500e2334e85c8a0e9e5d5d6774e7',
-
-  'src/third_party/safe_browsing/testing':
-    Var('chromium_git') + '/external/google-safe-browsing/testing.git' + '@' + '9d7e8064f3ca2e45891470c9b5b1dce54af6a9d6',
-
-  'src/third_party/cacheinvalidation/src':
-    Var('chromium_git') + '/external/google-cache-invalidation-api/src.git' + '@' + '108f1459d873db13c1914755a79333a09d4c563f', # from svn revision 339
-
-  'src/third_party/leveldatabase/src':
-    Var('chromium_git') + '/external/leveldb.git' + '@' + '3f77584eb3f9754bbb7079070873ece3f30a1e6b',
-
-  'src/third_party/libc++/trunk':
-   Var('chromium_git') + '/chromium/llvm-project/libcxx.git' + '@' +  Var('libcxx_revision'),
-
-  'src/third_party/libc++abi/trunk':
-   Var('chromium_git') + '/chromium/llvm-project/libcxxabi.git' + '@' +  Var('libcxxabi_revision'),
-
-  'src/third_party/snappy/src':
-    Var('chromium_git') + '/external/snappy.git' + '@' + '762bb32f0c9d2f31ba4958c7c0933d22e80c20bf',
-
-  'src/tools/grit':
-    Var('chromium_git') + '/external/grit-i18n.git' + '@' + '740badd5e3e44434a9a47b5d16749daac1e8ea80', # from svn revision 176
-
-  'src/tools/gyp':
-    Var('chromium_git') + '/external/gyp.git' + '@' + '46282cedf40ff7fe803be4af357b9d59050f02e4', # from svn revision 1977
-
-  'src/tools/swarming_client':
-   Var('chromium_git') + '/external/swarming.client.git' + '@' +  Var('swarming_revision'),
-
-  'src/v8':
-    Var('chromium_git') + '/external/v8.git' + '@' +  Var('v8_revision'),
-
-  'src/native_client':
-   Var('chromium_git') + '/native_client/src/native_client.git' + '@' + Var('nacl_revision'),
-
-  'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
-   Var('chromium_git') + '/native_client/src/native_client/tests/prebuilt.git' + '@' + '3e17365176c94624f46cace174f61834b7f3c35d',
-
-  'src/third_party/sfntly/cpp/src':
-    Var('chromium_git') + '/external/sfntly/cpp/src.git' + '@' +  Var('sfntly_revision'),
-
-  'src/third_party/skia':
-   Var('chromium_git') + '/skia.git' + '@' +  Var('skia_revision'),
-
-  'src/third_party/ots':
-    Var('chromium_git') + '/external/ots.git' + '@' + '98897009f3ea8a5fa3e20a4a74977da7aaa8e61a',
-
-  'src/third_party/brotli/src':
-   Var('chromium_git') + '/external/font-compression-reference.git' + '@' + '6cef49677dc4c650ef6e3f56041e0a41803afa8c',
-
-  'src/tools/page_cycler/acid3':
-   Var('chromium_git') + '/chromium/deps/acid3.git' + '@' + '6be0a66a1ebd7ebc5abc1b2f405a945f6d871521',
-
-  'src/chrome/test/data/perf/canvas_bench':
-   Var('chromium_git') + '/chromium/canvas_bench.git' + '@' + 'a7b40ea5ae0239517d78845a5fc9b12976bfc732',
-
-  'src/chrome/test/data/perf/frame_rate/content':
-   Var('chromium_git') + '/chromium/frame_rate/content.git' + '@' + 'c10272c88463efeef6bb19c9ec07c42bc8fe22b9',
-
-  'src/third_party/bidichecker':
-    Var('chromium_git') + '/external/bidichecker/lib.git' + '@' + '97f2aa645b74c28c57eca56992235c79850fa9e0',
-
-  'src/third_party/webgl/src':
-   Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '5906d1bcdd525d7d00914f1d4e43f7075452c43c',
-
-  'src/third_party/swig/Lib':
-   Var('chromium_git') + '/chromium/deps/swig/Lib.git' + '@' + 'f2a695d52e61e6a8d967731434f165ed400f0d69',
-
-  'src/third_party/webdriver/pylib':
-    Var('chromium_git') + '/external/selenium/py.git' + '@' + '5fd78261a75fe08d27ca4835fb6c5ce4b42275bd',
-
-  'src/third_party/libvpx':
-   Var('chromium_git') + '/chromium/deps/libvpx.git' + '@' +  Var('libvpx_revision'),
-
-  'src/third_party/ffmpeg':
-   Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '98ca32e50f6e38447bc81705d0689ebceb6ac649',
-
-  'src/third_party/libjingle/source/talk':
-    Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '965dd26ef1dfb1c2d5f3da91fad1c73bb73bc5fa',
-
-  'src/third_party/usrsctp/usrsctplib':
-    Var('chromium_git') + '/external/usrsctplib.git' + '@' + '8975bd5397c2ec97f50e0b87b544054e0536bfe1',
-
-  'src/third_party/libsrtp':
-   Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + 'dcc1fc62771b4f25fa5f91cddec8e9a491d0ee6d',
-
-  'src/third_party/speex':
-   Var('chromium_git') + '/chromium/deps/speex.git' + '@' + '5260621c36c227209c7ba64ea71ca3418cf9e2b4',
-
-  'src/third_party/yasm/source/patched-yasm':
-   Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'c960eb11ccda80b10ed50be39df4f0663b371d1d',
-
-  'src/third_party/libjpeg_turbo':
-   Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '034e9a9747e0983bc19808ea70e469bc8342081f',
-
-  'src/third_party/flac':
-   Var('chromium_git') + '/chromium/deps/flac.git' + '@' + '0635a091379d9677f1ddde5f2eec85d0f096f219',
-
-  'src/third_party/pyftpdlib/src':
-    Var('chromium_git') + '/external/pyftpdlib.git' + '@' + '2be6d65e31c7ee6320d059f581f05ae8d89d7e45',
-
-  'src/third_party/scons-2.0.1':
-   Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067',
-
-  'src/third_party/webrtc':
-    Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '61576f53599cf7840d3c4ebab82802b90031adcd',
-
-  'src/third_party/openmax_dl':
-    Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' +  Var('openmax_dl_revision'),
-
-  'src/third_party/jsoncpp/source/include':
-    Var('chromium_git') + '/external/jsoncpp/jsoncpp/include.git' + '@' + 'b0dd48e02b6e6248328db78a65b5c601f150c349',
-
-  'src/third_party/jsoncpp/source/src/lib_json':
-    Var('chromium_git') + '/external/jsoncpp/jsoncpp/src/lib_json.git' + '@' + 'a8caa51ba2f80971a45880425bf2ae864a786784',
-
-  'src/third_party/libyuv':
-    Var('chromium_git') + '/external/libyuv.git' + '@' + '455c66b4375d72984b79249616d0a708ad568894',
-
-  'src/third_party/smhasher/src':
-    Var('chromium_git') + '/external/smhasher.git' + '@' + 'e87738e57558e0ec472b2fc3a643b838e5b6e88f',
-
-  'src/third_party/libaddressinput/src':
-    Var('chromium_git') + '/external/libaddressinput.git' + '@' + '945d96387a716d0d82b195fa69a5e9a701249517', # from svn revision 334
-
-  'src/third_party/libphonenumber/src/phonenumbers':
-    Var('chromium_git') + '/external/libphonenumber/cpp/src/phonenumbers.git' + '@' + '8d8b5b3b2035197795d27573d4cf566b5d9ad689',
-  'src/third_party/libphonenumber/src/test':
-    Var('chromium_git') + '/external/libphonenumber/cpp/test.git' + '@' + '883b7b86541d64b2691f7c0e65facb0b08db73e8',
-  'src/third_party/libphonenumber/src/resources':
-    Var('chromium_git') + '/external/libphonenumber/resources.git' + '@' + 'de095548d2ae828a414e01f3951bfefba902b4e4',
-
-  'src/tools/deps2git':
-   Var('chromium_git') + '/chromium/tools/deps2git.git' + '@' + 'f04828eb0b5acd3e7ad983c024870f17f17b06d9',
-
-  'src/third_party/webpagereplay':
-   Var('chromium_git') + '/external/web-page-replay.git' + '@' + 'c06b45aa68a75b4207ea73be42d5d532bc03a1db',
-
-  'src/third_party/pywebsocket/src':
-    Var('chromium_git') + '/external/pywebsocket/src.git' + '@' + 'cb349e87ddb30ff8d1fa1a89be39cec901f4a29c',
-
-  'src/third_party/opus/src':
-   Var('chromium_git') + '/chromium/deps/opus.git' + '@' + 'cae696156f1e60006e39821e79a1811ae1933c69',
-
-  'src/media/cdm/ppapi/api':
-   Var('chromium_git') + '/chromium/cdm.git' + '@' + '41c8183a3966a17b440dbe606cb2840e1b7ce884',
-
-  'src/third_party/mesa/src':
-   Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + '457812d99a213dedf1c4cd38018ff48118d0c44f',
-
-  'src/third_party/cld_2/src':
-    Var('chromium_git') + '/external/cld2.git' + '@' + 'bb5c092e8c02dcc2319c5056aff2182199d51c2f',
-
-  'src/chrome/browser/resources/pdf/html_office':
-    Var('chromium_git') + '/chromium/html-office-public.git' + '@' + 'eeff97614f65e0578529490d44d412032c3d7359',
-
-  'src/third_party/libwebm/source':
-   Var('chromium_git') + '/webm/libwebm.git' + '@' + '0d4cb404ea4195e5e21d04db2c955615535ce62e',
-
-  'src/third_party/pdfium':
-   'https://pdfium.googlesource.com/pdfium.git' + '@' +  Var('pdfium_revision'),
-
-  'src/third_party/boringssl/src':
-   'https://boringssl.googlesource.com/boringssl.git' + '@' +  Var('boringssl_revision'),
-}
-
-
-deps_os = {
-  'win': {
-    'src/chrome/tools/test/reference_build/chrome_win':
-     Var('chromium_git') + '/chromium/reference_builds/chrome_win.git' + '@' + 'f8a3a845dfc845df6b14280f04f86a61959357ef',
-
-    'src/third_party/cygwin':
-     Var('chromium_git') + '/chromium/deps/cygwin.git' + '@' + 'c89e446b273697fadf3a10ff1007a97c0b7de6df',
-
-    'src/third_party/psyco_win32':
-     Var('chromium_git') + '/chromium/deps/psyco_win32.git' + '@' + 'f5af9f6910ee5a8075bbaeed0591469f1661d868',
-
-    'src/third_party/bison':
-     Var('chromium_git') + '/chromium/deps/bison.git' + '@' + '083c9a45e4affdd5464ee2b224c2df649c6e26c3',
-
-    'src/third_party/gperf':
-     Var('chromium_git') + '/chromium/deps/gperf.git' + '@' + 'd892d79f64f9449770443fb06da49b5a1e5d33c1',
-
-    'src/third_party/perl':
-     Var('chromium_git') + '/chromium/deps/perl.git' + '@' + 'ac0d98b5cee6c024b0cffeb4f8f45b6fc5ccdb78',
-
-    'src/third_party/lighttpd':
-     Var('chromium_git') + '/chromium/deps/lighttpd.git' + '@' + Var('lighttpd_revision'),
-
-    # Parses Windows PE/COFF executable format.
-    'src/third_party/pefile':
-     Var('chromium_git') + '/external/pefile.git' + '@' + '72c6ae42396cb913bcab63c15585dc3b5c3f92f1',
-
-    # NSS, for SSLClientSocketNSS.
-    'src/third_party/nss':
-     Var('chromium_git') + '/chromium/deps/nss.git' + '@' + Var('nss_revision'),
-
-    'src/third_party/swig/win':
-     Var('chromium_git') + '/chromium/deps/swig/win.git' + '@' + '986f013ba518541adf5c839811efb35630a31031',
-
-    # GNU binutils assembler for x86-32.
-    'src/third_party/gnu_binutils':
-      Var('chromium_git') + '/native_client/deps/third_party/gnu_binutils.git' + '@' + 'f4003433b61b25666565690caf3d7a7a1a4ec436',
-    # GNU binutils assembler for x86-64.
-    'src/third_party/mingw-w64/mingw/bin':
-      Var('chromium_git') + '/native_client/deps/third_party/mingw-w64/mingw/bin.git' + '@' + '3cc8b140b883a9fe4986d12cfd46c16a093d3527',
-
-    # Dependencies used by libjpeg-turbo
-    'src/third_party/yasm/binaries':
-     Var('chromium_git') + '/chromium/deps/yasm/binaries.git' + '@' + '52f9b3f4b0aa06da24ef8b123058bb61ee468881',
-
-    # Binaries for nacl sdk.
-    'src/third_party/nacl_sdk_binaries':
-     Var('chromium_git') + '/chromium/deps/nacl_sdk_binaries.git' + '@' + '759dfca03bdc774da7ecbf974f6e2b84f43699a5',
-  },
-  'ios': {
-    'src/third_party/google_toolbox_for_mac/src':
-      Var('chromium_git') + '/external/google-toolbox-for-mac.git' + '@' + Var('google_toolbox_for_mac_revision'),
-
-    'src/third_party/nss':
-     Var('chromium_git') + '/chromium/deps/nss.git' + '@' + Var('nss_revision'),
-
-    # class-dump utility to generate header files for undocumented SDKs
-    'src/testing/iossim/third_party/class-dump':
-     Var('chromium_git') + '/chromium/deps/class-dump.git' + '@' + '89bd40883c767584240b4dade8b74e6f57b9bdab',
-
-    # Code that's not needed due to not building everything
-    'src/build/util/support': None,
-    'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin': None,
-    'src/chrome/test/data/perf/canvas_bench': None,
-    'src/chrome/test/data/perf/frame_rate/content': None,
-    'src/media/cdm/ppapi/api': None,
-    'src/native_client': None,
-    'src/third_party/bidichecker': None,
-    'src/third_party/brotli/src': None,
-    'src/third_party/cld_2/src': None,
-    'src/third_party/ffmpeg': None,
-    'src/third_party/hunspell_dictionaries': None,
-    'src/third_party/hunspell': None,
-    'src/third_party/libc++/trunk': None,
-    'src/third_party/libc++abi/trunk': None,
-    'src/third_party/libexif/sources': None,
-    'src/third_party/libjpeg_turbo': None,
-    'src/third_party/libsrtp': None,
-    'src/third_party/opus/src': None,
-    'src/third_party/openmax_dl': None,
-    'src/third_party/ots': None,
-    'src/third_party/pymox/src': None,
-    'src/third_party/safe_browsing/testing': None,
-    'src/third_party/scons-2.0.1': None,
-    'src/third_party/sfntly/cpp/src': None,
-    'src/third_party/speex': None,
-    'src/third_party/swig/Lib': None,
-    'src/third_party/usrsctp/usrsctplib': None,
-    'src/third_party/v8-i18n': None,
-    'src/third_party/webdriver/pylib': None,
-    'src/third_party/webgl': None,
-    'src/third_party/webpagereplay': None,
-    'src/third_party/WebKit/LayoutTests/w3c/web-platform-tests': None,
-    'src/third_party/WebKit/LayoutTests/w3c/csswg-test': None,
-    'src/third_party/yasm/source/patched-yasm': None,
-    'src/tools/page_cycler/acid3': None,
-  },
-  'mac': {
-    'src/chrome/tools/test/reference_build/chrome_mac':
-     Var('chromium_git') + '/chromium/reference_builds/chrome_mac.git' + '@' + '8dc181329e7c5255f83b4b85dc2f71498a237955',
-
-    'src/third_party/google_toolbox_for_mac/src':
-      Var('chromium_git') + '/external/google-toolbox-for-mac.git' + '@' + Var('google_toolbox_for_mac_revision'),
-
-
-    'src/third_party/pdfsqueeze':
-      Var('chromium_git') + '/external/pdfsqueeze.git' + '@' + '5936b871e6a087b7e50d4cbcb122378d8a07499f',
-
-    'src/third_party/lighttpd':
-     Var('chromium_git') + '/chromium/deps/lighttpd.git' + '@' + Var('lighttpd_revision'),
-
-    'src/third_party/swig/mac':
-     Var('chromium_git') + '/chromium/deps/swig/mac.git' + '@' + '1b182eef16df2b506f1d710b34df65d55c1ac44e',
-
-    # NSS, for SSLClientSocketNSS.
-    'src/third_party/nss':
-     Var('chromium_git') + '/chromium/deps/nss.git' + '@' + Var('nss_revision'),
-
-    'src/chrome/installer/mac/third_party/xz/xz':
-     Var('chromium_git') + '/chromium/deps/xz.git' + '@' + 'eecaf55632ca72e90eb2641376bce7cdbc7284f7',
-  },
-  'unix': {
-    # Linux, really.
-    'src/chrome/tools/test/reference_build/chrome_linux':
-     Var('chromium_git') + '/chromium/reference_builds/chrome_linux64.git' + '@' + '033d053a528e820e1de3e2db766678d862a86b36',
-
-    'src/third_party/xdg-utils':
-     Var('chromium_git') + '/chromium/deps/xdg-utils.git' + '@' + 'd80274d5869b17b8c9067a1022e4416ee7ed5e0d',
-
-    'src/third_party/swig/linux':
-     Var('chromium_git') + '/chromium/deps/swig/linux.git' + '@' + '866b8e0e0e0cfe99ebe608260030916ca0c3f92d',
-
-    'src/third_party/lss':
-      Var('chromium_git') + '/external/linux-syscall-support/lss.git' + '@' + Var('lss_revision'),
-
-    # For Linux and Chromium OS.
-    'src/third_party/cros_system_api':
-     Var('chromium_git') + '/chromiumos/platform/system_api.git' + '@' + '3a7cfa4ba91518b8dd03282d09996d2f42ec6a2b',
-
-    # Note that this is different from Android's freetype repo.
-    'src/third_party/freetype2/src':
-     Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + 'd699c2994ecc178c4ed05ac2086061b2034c2178',
-
-    # Build tools for Chrome OS.
-    'src/third_party/chromite':
-     Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '1ae4638a4cd3313799f2d2598c39ff0e8941aef6',
-
-    # Dependency of chromite.git.
-    'src/third_party/pyelftools':
-     Var('chromium_git') + '/chromiumos/third_party/pyelftools.git' + '@' + 'bdc1d380acd88d4bfaf47265008091483b0d614e',
-
-    'src/third_party/undoview':
-     Var('chromium_git') + '/chromium/deps/undoview.git' + '@' + '3ba503e248f3cdbd81b78325a24ece0984637559',
-
-    'src/third_party/liblouis/src':
-     Var('chromium_git') + '/external/liblouis.git' + '@' + '3c2daee56250162e5a75830871601d74328d39f5',
-
-    # Used for embedded builds. CrOS & Linux use the system version.
-    'src/third_party/fontconfig/src':
-     Var('chromium_git') + '/external/fontconfig.git' + '@' + 'f16c3118e25546c1b749f9823c51827a60aeb5c1',
-  },
-  'android': {
-    'src/third_party/android_protobuf/src':
-     Var('chromium_git') + '/external/android_protobuf.git' + '@' + '94f522f907e3f34f70d9e7816b947e62fddbb267',
-
-    # Whenever you roll this please also change frameworks/webview in
-    # src/android_webview/buildbot/aosp_manifest.xml to point to the same revision.
-    'src/third_party/android_webview_glue/src':
-     Var('chromium_git') + '/external/android_webview_glue.git' + '@' + '60e4952d02f2bfa3f0705043b792c01f79ffbfa6',
-
-    'src/third_party/android_tools':
-     Var('chromium_git') + '/android_tools.git' + '@' + '7fc902d157a9aed7a2b68adc9c69181b3a43cd58',
-
-    'src/third_party/aosp':
-     Var('chromium_git') + '/chromium/deps/aosp.git' + '@' + 'bbafe5155dff86bbba1e92b42a073ffcfcfbf28c',
-
-    'src/third_party/apache-mime4j':
-     Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a',
-
-    'src/third_party/findbugs':
-     Var('chromium_git') + '/chromium/deps/findbugs.git' + '@' + '7f69fa78a6db6dc31866d09572a0e356e921bf12',
-
-    'src/third_party/freetype':
-     Var('chromium_git') + '/chromium/src/third_party/freetype.git' + '@' + 'a2b9955b49034a51dfbc8bf9f4e9d312149cecac',
-
-    'src/third_party/guava/src':
-     Var('chromium_git') + '/external/guava-libraries.git' + '@' + 'c523556ab7d0f05afadebd20e7768d4c16af8771',
-
-   'src/third_party/elfutils/src':
-     Var('chromium_git') + '/external/elfutils.git' + '@' + '249673729a7e5dbd5de4f3760bdcaa3d23d154d7',
-
-    'src/third_party/httpcomponents-client':
-     Var('chromium_git') + '/chromium/deps/httpcomponents-client.git' + '@' + '285c4dafc5de0e853fa845dce5773e223219601c',
-
-    'src/third_party/httpcomponents-core':
-     Var('chromium_git') + '/chromium/deps/httpcomponents-core.git' + '@' + '9f7180a96f8fa5cab23f793c14b413356d419e62',
-
-    'src/third_party/jarjar':
-     Var('chromium_git') + '/chromium/deps/jarjar.git' + '@' + '2e1ead4c68c450e0b77fe49e3f9137842b8b6920',
-
-    'src/third_party/jsr-305/src':
-      Var('chromium_git') + '/external/jsr-305.git' + '@' + '642c508235471f7220af6d5df2d3210e3bfc0919',
-
-    'src/third_party/lss':
-      Var('chromium_git') + '/external/linux-syscall-support/lss.git' + '@' + Var('lss_revision'),
-
-    'src/third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille':
-      Var('chromium_git') + '/external/eyes-free/braille/client/src/com/googlecode/eyesfree/braille.git' + '@' + '77bf6edb0138e3a38a2772248696f130dab45e34',
-  },
-}
-
-
-include_rules = [
-  # Everybody can use some things.
-  '+base',
-  '+build',
-  '+ipc',
-
-  # Everybody can use headers generated by tools/generate_library_loader.
-  '+library_loaders',
-
-  '+testing',
-  '+third_party/icu/source/common/unicode',
-  '+third_party/icu/source/i18n/unicode',
-  '+url',
-]
-
-
-# checkdeps.py shouldn't check include paths for files in these dirs:
-skip_child_includes = [
-  'breakpad',
-  'delegate_execute',
-  'metro_driver',
-  'native_client_sdk',
-  'o3d',
-  'sdch',
-  'skia',
-  'testing',
-  'third_party',
-  'v8',
-  'win8',
-]
-
-
-hooks = [
-  {
-    # This clobbers when necessary (based on get_landmines.py). It must be the
-    # first hook so that other things that get/generate into the output
-    # directory will not subsequently be clobbered.
-    'name': 'landmines',
-    'pattern': '.',
-    'action': [
-        'python',
-        'src/build/landmines.py',
-    ],
-  },
-  {
-    # This downloads binaries for Native Client's newlib toolchain.
-    # Done in lieu of building the toolchain from scratch as it can take
-    # anywhere from 30 minutes to 4 hours depending on platform to build.
-    'name': 'nacltools',
-    'pattern': '.',
-    'action': [
-        'python', 'src/build/download_nacl_toolchains.py',
-        '--exclude', 'arm_trusted',
-    ],
-  },
-  {
-    # Downloads an ARM sysroot image to src/arm-sysroot. This image updates
-    # at about the same rate that the chrome build deps change.
-    # This script is a no-op except for linux users who have
-    # target_arch=arm in their GYP_DEFINES.
-    'name': 'sysroot',
-    'pattern': '.',
-    'action': ['python', 'src/build/linux/install-arm-sysroot.py',
-               '--linux-only'],
-  },
-  {
-    # Downloads the Debian Wheezy sysroot to chrome/installer/linux if needed.
-    # This sysroot updates at about the same rate that the chrome build deps
-    # change. This script is a no-op except for linux users who are doing
-    # official chrome builds.
-    'name': 'sysroot',
-    'pattern': '.',
-    'action': [
-        'python',
-        'src/chrome/installer/linux/sysroot_scripts/install-debian.wheezy.sysroot.py',
-        '--linux-only',
-        '--arch=amd64'],
-  },
-  {
-    # Same as above, but for 32-bit Linux.
-    'name': 'sysroot',
-    'pattern': '.',
-    'action': [
-        'python',
-        'src/chrome/installer/linux/sysroot_scripts/install-debian.wheezy.sysroot.py',
-        '--linux-only',
-        '--arch=i386'],
-  },
-  {
-    # Pull clang if on Mac or clang is requested via GYP_DEFINES.
-    'name': 'clang',
-    'pattern': '.',
-    'action': ['python', 'src/tools/clang/scripts/update.py', '--if-needed'],
-  },
-  {
-    # Update the Windows toolchain if necessary.
-    'name': 'win_toolchain',
-    'pattern': '.',
-    'action': ['python', 'src/build/vs_toolchain.py', 'update'],
-  },
-  {
-    # Update LASTCHANGE. This is also run by export_tarball.py in
-    # src/tools/export_tarball - please keep them in sync.
-    'name': 'lastchange',
-    'pattern': '.',
-    'action': ['python', 'src/build/util/lastchange.py',
-               '-o', 'src/build/util/LASTCHANGE'],
-  },
-  {
-    # Update LASTCHANGE.blink. This is also run by export_tarball.py in
-    # src/tools/export_tarball - please keep them in sync.
-    'name': 'lastchange',
-    'pattern': '.',
-    'action': ['python', 'src/build/util/lastchange.py',
-               '-s', 'src/third_party/WebKit',
-               '-o', 'src/build/util/LASTCHANGE.blink'],
-  },
-  # Pull GN binaries. This needs to be before running GYP below.
-  {
-    'name': 'gn_win',
-    'pattern': '.',
-    'action': [ 'download_from_google_storage',
-                '--no_resume',
-                '--platform=win32',
-                '--no_auth',
-                '--bucket', 'chromium-gn',
-                '-s', 'src/buildtools/win/gn.exe.sha1',
-    ],
-  },
-  {
-    'name': 'gn_mac',
-    'pattern': '.',
-    'action': [ 'download_from_google_storage',
-                '--no_resume',
-                '--platform=darwin',
-                '--no_auth',
-                '--bucket', 'chromium-gn',
-                '-s', 'src/buildtools/mac/gn.sha1',
-    ],
-  },
-  {
-    'name': 'gn_linux32',
-    'pattern': '.',
-    'action': [ 'download_from_google_storage',
-                '--no_resume',
-                '--platform=linux*',
-                '--no_auth',
-                '--bucket', 'chromium-gn',
-                '-s', 'src/buildtools/linux32/gn.sha1',
-    ],
-  },
-  {
-    'name': 'gn_linux64',
-    'pattern': '.',
-    'action': [ 'download_from_google_storage',
-                '--no_resume',
-                '--platform=linux*',
-                '--no_auth',
-                '--bucket', 'chromium-gn',
-                '-s', 'src/buildtools/linux64/gn.sha1',
-    ],
-  },
-  {
-    # Remove GN binaries from tools/gn/bin that aren't used anymore.
-    # TODO(brettw) remove after the end of July, 2014.
-    'name': 'remove_old_gn_binaries',
-    'pattern': '.',
-    'action': ['python', 'src/tools/gn/bin/rm_binaries.py'],
-  },
-  # Pull clang-format binaries using checked-in hashes.
-  {
-    'name': 'clang_format_win',
-    'pattern': '.',
-    'action': [ 'download_from_google_storage',
-                '--no_resume',
-                '--platform=win32',
-                '--no_auth',
-                '--bucket', 'chromium-clang-format',
-                '-s', 'src/buildtools/win/clang-format.exe.sha1',
-    ],
-  },
-  {
-    'name': 'clang_format_mac',
-    'pattern': '.',
-    'action': [ 'download_from_google_storage',
-                '--no_resume',
-                '--platform=darwin',
-                '--no_auth',
-                '--bucket', 'chromium-clang-format',
-                '-s', 'src/buildtools/mac/clang-format.sha1',
-    ],
-  },
-  {
-    'name': 'clang_format_linux',
-    'pattern': '.',
-    'action': [ 'download_from_google_storage',
-                '--no_resume',
-                '--platform=linux*',
-                '--no_auth',
-                '--bucket', 'chromium-clang-format',
-                '-s', 'src/buildtools/linux64/clang-format.sha1',
-    ],
-  },
-  # Pull binutils for linux, enabled debug fission for faster linking /
-  # debugging when used with clang on Ubuntu Precise.
-  # https://code.google.com/p/chromium/issues/detail?id=352046
-  {
-    'name': 'binutils',
-    'pattern': 'src/third_party/binutils',
-    'action': [
-        'python',
-        'src/third_party/binutils/download.py',
-    ],
-  },
-  # Pull eu-strip binaries using checked-in hashes.
-  {
-    'name': 'eu-strip',
-    'pattern': '.',
-    'action': [ 'download_from_google_storage',
-                '--no_resume',
-                '--platform=linux*',
-                '--no_auth',
-                '--bucket', 'chromium-eu-strip',
-                '-s', 'src/build/linux/bin/eu-strip.sha1',
-    ],
-  },
-  {
-    'name': 'drmemory',
-    'pattern': '.',
-    'action': [ 'download_from_google_storage',
-                '--no_resume',
-                '--platform=win32',
-                '--no_auth',
-                '--bucket', 'chromium-drmemory',
-                '-s', 'src/third_party/drmemory/drmemory-windows-sfx.exe.sha1',
-              ],
-  },
-  # Pull the Syzygy binaries, used for optimization and instrumentation.
-  {
-    'name': 'syzygy-binaries',
-    'pattern': '.',
-    'action': ['python',
-               'src/build/get_syzygy_binaries.py',
-               '--output-dir=src/third_party/syzygy/binaries',
-               '--revision=363bc02a09c380b6f5f397606cc0744d85d54a51',
-               '--overwrite',
-    ],
-  },
-  {
-    'name': 'apache_win32',
-    'pattern': '\\.sha1',
-    'action': [ 'download_from_google_storage',
-                '--no_resume',
-                '--platform=win32',
-                '--directory',
-                '--recursive',
-                '--no_auth',
-                '--num_threads=16',
-                '--bucket', 'chromium-apache-win32',
-                'src/third_party/apache-win32',
-    ],
-  },
-  {
-    # A change to a .gyp, .gypi, or to GYP itself should run the generator.
-    'name': 'gyp',
-    'pattern': '.',
-    'action': ['python', 'src/build/gyp_chromium'],
-  },
-  {
-    # Verify committers' ~/.netc, gclient and git are properly configured for
-    # write access to the git repo. To be removed sometime after Chrome to git
-    # migration completes (let's say Sep 1 2014).
-    'name': 'check_git_config',
-    'pattern': '.',
-    'action': [
-        'python',
-        'src/tools/check_git_config.py',
-        '--running-as-hook',
-    ],
-  },
-  {
-    # Ensure that we don't accidentally reference any .pyc files whose
-    # corresponding .py files have already been deleted.
-    'name': 'remove_stale_pyc_files',
-    'pattern': 'src/tools/.*\\.py',
-    'action': [
-        'python',
-        'src/tools/remove_stale_pyc_files.py',
-        'src/tools',
-    ],
-  },
-]
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 972bb2e..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/LICENSE.chromium_os b/LICENSE.chromium_os
deleted file mode 100644
index 0aa7fc9..0000000
--- a/LICENSE.chromium_os
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2006-2009 The Chromium OS Authors. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/OWNERS b/OWNERS
deleted file mode 100644
index 4c215b4..0000000
--- a/OWNERS
+++ /dev/null
@@ -1,13 +0,0 @@
-darin@chromium.org
-ben@chromium.org
-per-file .gitignore=*
-per-file .gn=brettw@chromium.org
-per-file BUILD.gn=brettw@chromium.org
-per-file DEPS=*
-per-file AUTHORS=*
-per-file WATCHLISTS=*
-per-file Android.mk=benm@chromium.org
-per-file Android.mk=torne@chromium.org
-per-file PRESUBMIT*.py=maruel@chromium.org
-per-file PRESUBMIT*.py=jochen@chromium.org
-per-file PRESUBMIT*.py=phajdan.jr@chromium.org
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
deleted file mode 100644
index 5623f60..0000000
--- a/PRESUBMIT.py
+++ /dev/null
@@ -1,1598 +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.
-
-"""Top-level presubmit script for Chromium.
-
-See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-for more details about the presubmit API built into gcl.
-"""
-
-
-import re
-import sys
-
-
-_EXCLUDED_PATHS = (
-    r"^breakpad[\\\/].*",
-    r"^native_client_sdk[\\\/]src[\\\/]build_tools[\\\/]make_rules.py",
-    r"^native_client_sdk[\\\/]src[\\\/]build_tools[\\\/]make_simple.py",
-    r"^native_client_sdk[\\\/]src[\\\/]tools[\\\/].*.mk",
-    r"^net[\\\/]tools[\\\/]spdyshark[\\\/].*",
-    r"^skia[\\\/].*",
-    r"^v8[\\\/].*",
-    r".*MakeFile$",
-    r".+_autogen\.h$",
-    r".+[\\\/]pnacl_shim\.c$",
-    r"^gpu[\\\/]config[\\\/].*_list_json\.cc$",
-    r"^chrome[\\\/]browser[\\\/]resources[\\\/]pdf[\\\/]index.js"
-)
-
-# TestRunner and NetscapePlugIn library is temporarily excluded from pan-project
-# checks until it's transitioned to chromium coding style.
-_TESTRUNNER_PATHS = (
-    r"^content[\\\/]shell[\\\/]renderer[\\\/]test_runner[\\\/].*",
-    r"^content[\\\/]shell[\\\/]tools[\\\/]plugin[\\\/].*",
-)
-
-# Fragment of a regular expression that matches C++ and Objective-C++
-# implementation files.
-_IMPLEMENTATION_EXTENSIONS = r'\.(cc|cpp|cxx|mm)$'
-
-# Regular expression that matches code only used for test binaries
-# (best effort).
-_TEST_CODE_EXCLUDED_PATHS = (
-    r'.*[\\\/](fake_|test_|mock_).+%s' % _IMPLEMENTATION_EXTENSIONS,
-    r'.+_test_(base|support|util)%s' % _IMPLEMENTATION_EXTENSIONS,
-    r'.+_(api|browser|kif|perf|pixel|unit|ui)?test(_[a-z]+)?%s' %
-        _IMPLEMENTATION_EXTENSIONS,
-    r'.+profile_sync_service_harness%s' % _IMPLEMENTATION_EXTENSIONS,
-    r'.*[\\\/](test|tool(s)?)[\\\/].*',
-    # content_shell is used for running layout tests.
-    r'content[\\\/]shell[\\\/].*',
-    # At request of folks maintaining this folder.
-    r'chrome[\\\/]browser[\\\/]automation[\\\/].*',
-    # Non-production example code.
-    r'mojo[\\\/]examples[\\\/].*',
-    # Launcher for running iOS tests on the simulator.
-    r'testing[\\\/]iossim[\\\/]iossim\.mm$',
-)
-
-_TEST_ONLY_WARNING = (
-    'You might be calling functions intended only for testing from\n'
-    'production code.  It is OK to ignore this warning if you know what\n'
-    'you are doing, as the heuristics used to detect the situation are\n'
-    'not perfect.  The commit queue will not block on this warning.')
-
-
-_INCLUDE_ORDER_WARNING = (
-    'Your #include order seems to be broken. Send mail to\n'
-    'marja@chromium.org if this is not the case.')
-
-
-_BANNED_OBJC_FUNCTIONS = (
-    (
-      'addTrackingRect:',
-      (
-       'The use of -[NSView addTrackingRect:owner:userData:assumeInside:] is'
-       'prohibited. Please use CrTrackingArea instead.',
-       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-      ),
-      False,
-    ),
-    (
-      r'/NSTrackingArea\W',
-      (
-       'The use of NSTrackingAreas is prohibited. Please use CrTrackingArea',
-       'instead.',
-       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-      ),
-      False,
-    ),
-    (
-      'convertPointFromBase:',
-      (
-       'The use of -[NSView convertPointFromBase:] is almost certainly wrong.',
-       'Please use |convertPoint:(point) fromView:nil| instead.',
-       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-      ),
-      True,
-    ),
-    (
-      'convertPointToBase:',
-      (
-       'The use of -[NSView convertPointToBase:] is almost certainly wrong.',
-       'Please use |convertPoint:(point) toView:nil| instead.',
-       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-      ),
-      True,
-    ),
-    (
-      'convertRectFromBase:',
-      (
-       'The use of -[NSView convertRectFromBase:] is almost certainly wrong.',
-       'Please use |convertRect:(point) fromView:nil| instead.',
-       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-      ),
-      True,
-    ),
-    (
-      'convertRectToBase:',
-      (
-       'The use of -[NSView convertRectToBase:] is almost certainly wrong.',
-       'Please use |convertRect:(point) toView:nil| instead.',
-       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-      ),
-      True,
-    ),
-    (
-      'convertSizeFromBase:',
-      (
-       'The use of -[NSView convertSizeFromBase:] is almost certainly wrong.',
-       'Please use |convertSize:(point) fromView:nil| instead.',
-       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-      ),
-      True,
-    ),
-    (
-      'convertSizeToBase:',
-      (
-       'The use of -[NSView convertSizeToBase:] is almost certainly wrong.',
-       'Please use |convertSize:(point) toView:nil| instead.',
-       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-      ),
-      True,
-    ),
-)
-
-
-_BANNED_CPP_FUNCTIONS = (
-    # Make sure that gtest's FRIEND_TEST() macro is not used; the
-    # FRIEND_TEST_ALL_PREFIXES() macro from base/gtest_prod_util.h should be
-    # used instead since that allows for FLAKY_ and DISABLED_ prefixes.
-    (
-      'FRIEND_TEST(',
-      (
-       'Chromium code should not use gtest\'s FRIEND_TEST() macro. Include',
-       'base/gtest_prod_util.h and use FRIEND_TEST_ALL_PREFIXES() instead.',
-      ),
-      False,
-      (),
-    ),
-    (
-      'ScopedAllowIO',
-      (
-       'New code should not use ScopedAllowIO. Post a task to the blocking',
-       'pool or the FILE thread instead.',
-      ),
-      True,
-      (
-        r"^base[\\\/]process[\\\/]process_metrics_linux\.cc$",
-        r"^chrome[\\\/]browser[\\\/]chromeos[\\\/]boot_times_loader\.cc$",
-        r"^components[\\\/]crash[\\\/]app[\\\/]breakpad_mac\.mm$",
-        r"^content[\\\/]shell[\\\/]browser[\\\/]shell_browser_main\.cc$",
-        r"^content[\\\/]shell[\\\/]browser[\\\/]shell_message_filter\.cc$",
-        r"^mojo[\\\/]system[\\\/]raw_shared_buffer_posix\.cc$",
-        r"^net[\\\/]disk_cache[\\\/]cache_util\.cc$",
-        r"^net[\\\/]url_request[\\\/]test_url_fetcher_factory\.cc$",
-      ),
-    ),
-    (
-      'SkRefPtr',
-      (
-        'The use of SkRefPtr is prohibited. ',
-        'Please use skia::RefPtr instead.'
-      ),
-      True,
-      (),
-    ),
-    (
-      'SkAutoRef',
-      (
-        'The indirect use of SkRefPtr via SkAutoRef is prohibited. ',
-        'Please use skia::RefPtr instead.'
-      ),
-      True,
-      (),
-    ),
-    (
-      'SkAutoTUnref',
-      (
-        'The use of SkAutoTUnref is dangerous because it implicitly ',
-        'converts to a raw pointer. Please use skia::RefPtr instead.'
-      ),
-      True,
-      (),
-    ),
-    (
-      'SkAutoUnref',
-      (
-        'The indirect use of SkAutoTUnref through SkAutoUnref is dangerous ',
-        'because it implicitly converts to a raw pointer. ',
-        'Please use skia::RefPtr instead.'
-      ),
-      True,
-      (),
-    ),
-    (
-      r'/HANDLE_EINTR\(.*close',
-      (
-       'HANDLE_EINTR(close) is invalid. If close fails with EINTR, the file',
-       'descriptor will be closed, and it is incorrect to retry the close.',
-       'Either call close directly and ignore its return value, or wrap close',
-       'in IGNORE_EINTR to use its return value. See http://crbug.com/269623'
-      ),
-      True,
-      (),
-    ),
-    (
-      r'/IGNORE_EINTR\((?!.*close)',
-      (
-       'IGNORE_EINTR is only valid when wrapping close. To wrap other system',
-       'calls, use HANDLE_EINTR. See http://crbug.com/269623',
-      ),
-      True,
-      (
-        # Files that #define IGNORE_EINTR.
-        r'^base[\\\/]posix[\\\/]eintr_wrapper\.h$',
-        r'^ppapi[\\\/]tests[\\\/]test_broker\.cc$',
-      ),
-    ),
-    (
-      r'/v8::Extension\(',
-      (
-        'Do not introduce new v8::Extensions into the code base, use',
-        'gin::Wrappable instead. See http://crbug.com/334679',
-      ),
-      True,
-      (
-        r'extensions[\\\/]renderer[\\\/]safe_builtins\.*',
-      ),
-    ),
-)
-
-
-_VALID_OS_MACROS = (
-    # Please keep sorted.
-    'OS_ANDROID',
-    'OS_ANDROID_HOST',
-    'OS_BSD',
-    'OS_CAT',       # For testing.
-    'OS_CHROMEOS',
-    'OS_FREEBSD',
-    'OS_IOS',
-    'OS_LINUX',
-    'OS_MACOSX',
-    'OS_NACL',
-    'OS_OPENBSD',
-    'OS_POSIX',
-    'OS_QNX',
-    'OS_SOLARIS',
-    'OS_WIN',
-)
-
-
-def _CheckNoProductionCodeUsingTestOnlyFunctions(input_api, output_api):
-  """Attempts to prevent use of functions intended only for testing in
-  non-testing code. For now this is just a best-effort implementation
-  that ignores header files and may have some false positives. A
-  better implementation would probably need a proper C++ parser.
-  """
-  # We only scan .cc files and the like, as the declaration of
-  # for-testing functions in header files are hard to distinguish from
-  # calls to such functions without a proper C++ parser.
-  file_inclusion_pattern = r'.+%s' % _IMPLEMENTATION_EXTENSIONS
-
-  base_function_pattern = r'[ :]test::[^\s]+|ForTest(ing)?|for_test(ing)?'
-  inclusion_pattern = input_api.re.compile(r'(%s)\s*\(' % base_function_pattern)
-  comment_pattern = input_api.re.compile(r'//.*(%s)' % base_function_pattern)
-  exclusion_pattern = input_api.re.compile(
-    r'::[A-Za-z0-9_]+(%s)|(%s)[^;]+\{' % (
-      base_function_pattern, base_function_pattern))
-
-  def FilterFile(affected_file):
-    black_list = (_EXCLUDED_PATHS +
-                  _TEST_CODE_EXCLUDED_PATHS +
-                  input_api.DEFAULT_BLACK_LIST)
-    return input_api.FilterSourceFile(
-      affected_file,
-      white_list=(file_inclusion_pattern, ),
-      black_list=black_list)
-
-  problems = []
-  for f in input_api.AffectedSourceFiles(FilterFile):
-    local_path = f.LocalPath()
-    for line_number, line in f.ChangedContents():
-      if (inclusion_pattern.search(line) and
-          not comment_pattern.search(line) and
-          not exclusion_pattern.search(line)):
-        problems.append(
-          '%s:%d\n    %s' % (local_path, line_number, line.strip()))
-
-  if problems:
-    return [output_api.PresubmitPromptOrNotify(_TEST_ONLY_WARNING, problems)]
-  else:
-    return []
-
-
-def _CheckNoIOStreamInHeaders(input_api, output_api):
-  """Checks to make sure no .h files include <iostream>."""
-  files = []
-  pattern = input_api.re.compile(r'^#include\s*<iostream>',
-                                 input_api.re.MULTILINE)
-  for f in input_api.AffectedSourceFiles(input_api.FilterSourceFile):
-    if not f.LocalPath().endswith('.h'):
-      continue
-    contents = input_api.ReadFile(f)
-    if pattern.search(contents):
-      files.append(f)
-
-  if len(files):
-    return [ output_api.PresubmitError(
-        'Do not #include <iostream> in header files, since it inserts static '
-        'initialization into every file including the header. Instead, '
-        '#include <ostream>. See http://crbug.com/94794',
-        files) ]
-  return []
-
-
-def _CheckNoUNIT_TESTInSourceFiles(input_api, output_api):
-  """Checks to make sure no source files use UNIT_TEST"""
-  problems = []
-  for f in input_api.AffectedFiles():
-    if (not f.LocalPath().endswith(('.cc', '.mm'))):
-      continue
-
-    for line_num, line in f.ChangedContents():
-      if 'UNIT_TEST ' in line or line.endswith('UNIT_TEST'):
-        problems.append('    %s:%d' % (f.LocalPath(), line_num))
-
-  if not problems:
-    return []
-  return [output_api.PresubmitPromptWarning('UNIT_TEST is only for headers.\n' +
-      '\n'.join(problems))]
-
-
-def _CheckNoNewWStrings(input_api, output_api):
-  """Checks to make sure we don't introduce use of wstrings."""
-  problems = []
-  for f in input_api.AffectedFiles():
-    if (not f.LocalPath().endswith(('.cc', '.h')) or
-        f.LocalPath().endswith(('test.cc', '_win.cc', '_win.h'))):
-      continue
-
-    allowWString = False
-    for line_num, line in f.ChangedContents():
-      if 'presubmit: allow wstring' in line:
-        allowWString = True
-      elif not allowWString and 'wstring' in line:
-        problems.append('    %s:%d' % (f.LocalPath(), line_num))
-        allowWString = False
-      else:
-        allowWString = False
-
-  if not problems:
-    return []
-  return [output_api.PresubmitPromptWarning('New code should not use wstrings.'
-      '  If you are calling a cross-platform API that accepts a wstring, '
-      'fix the API.\n' +
-      '\n'.join(problems))]
-
-
-def _CheckNoDEPSGIT(input_api, output_api):
-  """Make sure .DEPS.git is never modified manually."""
-  if any(f.LocalPath().endswith('.DEPS.git') for f in
-      input_api.AffectedFiles()):
-    return [output_api.PresubmitError(
-      'Never commit changes to .DEPS.git. This file is maintained by an\n'
-      'automated system based on what\'s in DEPS and your changes will be\n'
-      'overwritten.\n'
-      'See https://sites.google.com/a/chromium.org/dev/developers/how-tos/get-the-code#Rolling_DEPS\n'
-      'for more information')]
-  return []
-
-
-def _CheckNoBannedFunctions(input_api, output_api):
-  """Make sure that banned functions are not used."""
-  warnings = []
-  errors = []
-
-  file_filter = lambda f: f.LocalPath().endswith(('.mm', '.m', '.h'))
-  for f in input_api.AffectedFiles(file_filter=file_filter):
-    for line_num, line in f.ChangedContents():
-      for func_name, message, error in _BANNED_OBJC_FUNCTIONS:
-        matched = False
-        if func_name[0:1] == '/':
-          regex = func_name[1:]
-          if input_api.re.search(regex, line):
-            matched = True
-        elif func_name in line:
-            matched = True
-        if matched:
-          problems = warnings;
-          if error:
-            problems = errors;
-          problems.append('    %s:%d:' % (f.LocalPath(), line_num))
-          for message_line in message:
-            problems.append('      %s' % message_line)
-
-  file_filter = lambda f: f.LocalPath().endswith(('.cc', '.mm', '.h'))
-  for f in input_api.AffectedFiles(file_filter=file_filter):
-    for line_num, line in f.ChangedContents():
-      for func_name, message, error, excluded_paths in _BANNED_CPP_FUNCTIONS:
-        def IsBlacklisted(affected_file, blacklist):
-          local_path = affected_file.LocalPath()
-          for item in blacklist:
-            if input_api.re.match(item, local_path):
-              return True
-          return False
-        if IsBlacklisted(f, excluded_paths):
-          continue
-        matched = False
-        if func_name[0:1] == '/':
-          regex = func_name[1:]
-          if input_api.re.search(regex, line):
-            matched = True
-        elif func_name in line:
-            matched = True
-        if matched:
-          problems = warnings;
-          if error:
-            problems = errors;
-          problems.append('    %s:%d:' % (f.LocalPath(), line_num))
-          for message_line in message:
-            problems.append('      %s' % message_line)
-
-  result = []
-  if (warnings):
-    result.append(output_api.PresubmitPromptWarning(
-        'Banned functions were used.\n' + '\n'.join(warnings)))
-  if (errors):
-    result.append(output_api.PresubmitError(
-        'Banned functions were used.\n' + '\n'.join(errors)))
-  return result
-
-
-def _CheckNoPragmaOnce(input_api, output_api):
-  """Make sure that banned functions are not used."""
-  files = []
-  pattern = input_api.re.compile(r'^#pragma\s+once',
-                                 input_api.re.MULTILINE)
-  for f in input_api.AffectedSourceFiles(input_api.FilterSourceFile):
-    if not f.LocalPath().endswith('.h'):
-      continue
-    contents = input_api.ReadFile(f)
-    if pattern.search(contents):
-      files.append(f)
-
-  if files:
-    return [output_api.PresubmitError(
-        'Do not use #pragma once in header files.\n'
-        'See http://www.chromium.org/developers/coding-style#TOC-File-headers',
-        files)]
-  return []
-
-
-def _CheckNoTrinaryTrueFalse(input_api, output_api):
-  """Checks to make sure we don't introduce use of foo ? true : false."""
-  problems = []
-  pattern = input_api.re.compile(r'\?\s*(true|false)\s*:\s*(true|false)')
-  for f in input_api.AffectedFiles():
-    if not f.LocalPath().endswith(('.cc', '.h', '.inl', '.m', '.mm')):
-      continue
-
-    for line_num, line in f.ChangedContents():
-      if pattern.match(line):
-        problems.append('    %s:%d' % (f.LocalPath(), line_num))
-
-  if not problems:
-    return []
-  return [output_api.PresubmitPromptWarning(
-      'Please consider avoiding the "? true : false" pattern if possible.\n' +
-      '\n'.join(problems))]
-
-
-def _CheckUnwantedDependencies(input_api, output_api):
-  """Runs checkdeps on #include statements added in this
-  change. Breaking - rules is an error, breaking ! rules is a
-  warning.
-  """
-  # We need to wait until we have an input_api object and use this
-  # roundabout construct to import checkdeps because this file is
-  # eval-ed and thus doesn't have __file__.
-  original_sys_path = sys.path
-  try:
-    sys.path = sys.path + [input_api.os_path.join(
-        input_api.PresubmitLocalPath(), 'buildtools', 'checkdeps')]
-    import checkdeps
-    from cpp_checker import CppChecker
-    from rules import Rule
-  finally:
-    # Restore sys.path to what it was before.
-    sys.path = original_sys_path
-
-  added_includes = []
-  for f in input_api.AffectedFiles():
-    if not CppChecker.IsCppFile(f.LocalPath()):
-      continue
-
-    changed_lines = [line for line_num, line in f.ChangedContents()]
-    added_includes.append([f.LocalPath(), changed_lines])
-
-  deps_checker = checkdeps.DepsChecker(input_api.PresubmitLocalPath())
-
-  error_descriptions = []
-  warning_descriptions = []
-  for path, rule_type, rule_description in deps_checker.CheckAddedCppIncludes(
-      added_includes):
-    description_with_path = '%s\n    %s' % (path, rule_description)
-    if rule_type == Rule.DISALLOW:
-      error_descriptions.append(description_with_path)
-    else:
-      warning_descriptions.append(description_with_path)
-
-  results = []
-  if error_descriptions:
-    results.append(output_api.PresubmitError(
-        'You added one or more #includes that violate checkdeps rules.',
-        error_descriptions))
-  if warning_descriptions:
-    results.append(output_api.PresubmitPromptOrNotify(
-        'You added one or more #includes of files that are temporarily\n'
-        'allowed but being removed. Can you avoid introducing the\n'
-        '#include? See relevant DEPS file(s) for details and contacts.',
-        warning_descriptions))
-  return results
-
-
-def _CheckFilePermissions(input_api, output_api):
-  """Check that all files have their permissions properly set."""
-  if input_api.platform == 'win32':
-    return []
-  args = [sys.executable, 'tools/checkperms/checkperms.py', '--root',
-          input_api.change.RepositoryRoot()]
-  for f in input_api.AffectedFiles():
-    args += ['--file', f.LocalPath()]
-  checkperms = input_api.subprocess.Popen(args,
-                                          stdout=input_api.subprocess.PIPE)
-  errors = checkperms.communicate()[0].strip()
-  if errors:
-    return [output_api.PresubmitError('checkperms.py failed.',
-                                      errors.splitlines())]
-  return []
-
-
-def _CheckNoAuraWindowPropertyHInHeaders(input_api, output_api):
-  """Makes sure we don't include ui/aura/window_property.h
-  in header files.
-  """
-  pattern = input_api.re.compile(r'^#include\s*"ui/aura/window_property.h"')
-  errors = []
-  for f in input_api.AffectedFiles():
-    if not f.LocalPath().endswith('.h'):
-      continue
-    for line_num, line in f.ChangedContents():
-      if pattern.match(line):
-        errors.append('    %s:%d' % (f.LocalPath(), line_num))
-
-  results = []
-  if errors:
-    results.append(output_api.PresubmitError(
-      'Header files should not include ui/aura/window_property.h', errors))
-  return results
-
-
-def _CheckIncludeOrderForScope(scope, input_api, file_path, changed_linenums):
-  """Checks that the lines in scope occur in the right order.
-
-  1. C system files in alphabetical order
-  2. C++ system files in alphabetical order
-  3. Project's .h files
-  """
-
-  c_system_include_pattern = input_api.re.compile(r'\s*#include <.*\.h>')
-  cpp_system_include_pattern = input_api.re.compile(r'\s*#include <.*>')
-  custom_include_pattern = input_api.re.compile(r'\s*#include ".*')
-
-  C_SYSTEM_INCLUDES, CPP_SYSTEM_INCLUDES, CUSTOM_INCLUDES = range(3)
-
-  state = C_SYSTEM_INCLUDES
-
-  previous_line = ''
-  previous_line_num = 0
-  problem_linenums = []
-  for line_num, line in scope:
-    if c_system_include_pattern.match(line):
-      if state != C_SYSTEM_INCLUDES:
-        problem_linenums.append((line_num, previous_line_num))
-      elif previous_line and previous_line > line:
-        problem_linenums.append((line_num, previous_line_num))
-    elif cpp_system_include_pattern.match(line):
-      if state == C_SYSTEM_INCLUDES:
-        state = CPP_SYSTEM_INCLUDES
-      elif state == CUSTOM_INCLUDES:
-        problem_linenums.append((line_num, previous_line_num))
-      elif previous_line and previous_line > line:
-        problem_linenums.append((line_num, previous_line_num))
-    elif custom_include_pattern.match(line):
-      if state != CUSTOM_INCLUDES:
-        state = CUSTOM_INCLUDES
-      elif previous_line and previous_line > line:
-        problem_linenums.append((line_num, previous_line_num))
-    else:
-      problem_linenums.append(line_num)
-    previous_line = line
-    previous_line_num = line_num
-
-  warnings = []
-  for (line_num, previous_line_num) in problem_linenums:
-    if line_num in changed_linenums or previous_line_num in changed_linenums:
-      warnings.append('    %s:%d' % (file_path, line_num))
-  return warnings
-
-
-def _CheckIncludeOrderInFile(input_api, f, changed_linenums):
-  """Checks the #include order for the given file f."""
-
-  system_include_pattern = input_api.re.compile(r'\s*#include \<.*')
-  # Exclude the following includes from the check:
-  # 1) #include <.../...>, e.g., <sys/...> includes often need to appear in a
-  # specific order.
-  # 2) <atlbase.h>, "build/build_config.h"
-  excluded_include_pattern = input_api.re.compile(
-      r'\s*#include (\<.*/.*|\<atlbase\.h\>|"build/build_config.h")')
-  custom_include_pattern = input_api.re.compile(r'\s*#include "(?P<FILE>.*)"')
-  # Match the final or penultimate token if it is xxxtest so we can ignore it
-  # when considering the special first include.
-  test_file_tag_pattern = input_api.re.compile(
-    r'_[a-z]+test(?=(_[a-zA-Z0-9]+)?\.)')
-  if_pattern = input_api.re.compile(
-      r'\s*#\s*(if|elif|else|endif|define|undef).*')
-  # Some files need specialized order of includes; exclude such files from this
-  # check.
-  uncheckable_includes_pattern = input_api.re.compile(
-      r'\s*#include '
-      '("ipc/.*macros\.h"|<windows\.h>|".*gl.*autogen.h")\s*')
-
-  contents = f.NewContents()
-  warnings = []
-  line_num = 0
-
-  # Handle the special first include. If the first include file is
-  # some/path/file.h, the corresponding including file can be some/path/file.cc,
-  # some/other/path/file.cc, some/path/file_platform.cc, some/path/file-suffix.h
-  # etc. It's also possible that no special first include exists.
-  # If the included file is some/path/file_platform.h the including file could
-  # also be some/path/file_xxxtest_platform.h.
-  including_file_base_name = test_file_tag_pattern.sub(
-    '', input_api.os_path.basename(f.LocalPath()))
-
-  for line in contents:
-    line_num += 1
-    if system_include_pattern.match(line):
-      # No special first include -> process the line again along with normal
-      # includes.
-      line_num -= 1
-      break
-    match = custom_include_pattern.match(line)
-    if match:
-      match_dict = match.groupdict()
-      header_basename = test_file_tag_pattern.sub(
-        '', input_api.os_path.basename(match_dict['FILE'])).replace('.h', '')
-
-      if header_basename not in including_file_base_name:
-        # No special first include -> process the line again along with normal
-        # includes.
-        line_num -= 1
-      break
-
-  # Split into scopes: Each region between #if and #endif is its own scope.
-  scopes = []
-  current_scope = []
-  for line in contents[line_num:]:
-    line_num += 1
-    if uncheckable_includes_pattern.match(line):
-      continue
-    if if_pattern.match(line):
-      scopes.append(current_scope)
-      current_scope = []
-    elif ((system_include_pattern.match(line) or
-           custom_include_pattern.match(line)) and
-          not excluded_include_pattern.match(line)):
-      current_scope.append((line_num, line))
-  scopes.append(current_scope)
-
-  for scope in scopes:
-    warnings.extend(_CheckIncludeOrderForScope(scope, input_api, f.LocalPath(),
-                                               changed_linenums))
-  return warnings
-
-
-def _CheckIncludeOrder(input_api, output_api):
-  """Checks that the #include order is correct.
-
-  1. The corresponding header for source files.
-  2. C system files in alphabetical order
-  3. C++ system files in alphabetical order
-  4. Project's .h files in alphabetical order
-
-  Each region separated by #if, #elif, #else, #endif, #define and #undef follows
-  these rules separately.
-  """
-  def FileFilterIncludeOrder(affected_file):
-    black_list = (_EXCLUDED_PATHS + input_api.DEFAULT_BLACK_LIST)
-    return input_api.FilterSourceFile(affected_file, black_list=black_list)
-
-  warnings = []
-  for f in input_api.AffectedFiles(file_filter=FileFilterIncludeOrder):
-    if f.LocalPath().endswith(('.cc', '.h')):
-      changed_linenums = set(line_num for line_num, _ in f.ChangedContents())
-      warnings.extend(_CheckIncludeOrderInFile(input_api, f, changed_linenums))
-
-  results = []
-  if warnings:
-    results.append(output_api.PresubmitPromptOrNotify(_INCLUDE_ORDER_WARNING,
-                                                      warnings))
-  return results
-
-
-def _CheckForVersionControlConflictsInFile(input_api, f):
-  pattern = input_api.re.compile('^(?:<<<<<<<|>>>>>>>) |^=======$')
-  errors = []
-  for line_num, line in f.ChangedContents():
-    if pattern.match(line):
-      errors.append('    %s:%d %s' % (f.LocalPath(), line_num, line))
-  return errors
-
-
-def _CheckForVersionControlConflicts(input_api, output_api):
-  """Usually this is not intentional and will cause a compile failure."""
-  errors = []
-  for f in input_api.AffectedFiles():
-    errors.extend(_CheckForVersionControlConflictsInFile(input_api, f))
-
-  results = []
-  if errors:
-    results.append(output_api.PresubmitError(
-      'Version control conflict markers found, please resolve.', errors))
-  return results
-
-
-def _CheckHardcodedGoogleHostsInLowerLayers(input_api, output_api):
-  def FilterFile(affected_file):
-    """Filter function for use with input_api.AffectedSourceFiles,
-    below.  This filters out everything except non-test files from
-    top-level directories that generally speaking should not hard-code
-    service URLs (e.g. src/android_webview/, src/content/ and others).
-    """
-    return input_api.FilterSourceFile(
-      affected_file,
-      white_list=(r'^(android_webview|base|content|net)[\\\/].*', ),
-      black_list=(_EXCLUDED_PATHS +
-                  _TEST_CODE_EXCLUDED_PATHS +
-                  input_api.DEFAULT_BLACK_LIST))
-
-  base_pattern = '"[^"]*google\.com[^"]*"'
-  comment_pattern = input_api.re.compile('//.*%s' % base_pattern)
-  pattern = input_api.re.compile(base_pattern)
-  problems = []  # items are (filename, line_number, line)
-  for f in input_api.AffectedSourceFiles(FilterFile):
-    for line_num, line in f.ChangedContents():
-      if not comment_pattern.search(line) and pattern.search(line):
-        problems.append((f.LocalPath(), line_num, line))
-
-  if problems:
-    return [output_api.PresubmitPromptOrNotify(
-        'Most layers below src/chrome/ should not hardcode service URLs.\n'
-        'Are you sure this is correct?',
-        ['  %s:%d:  %s' % (
-            problem[0], problem[1], problem[2]) for problem in problems])]
-  else:
-    return []
-
-
-def _CheckNoAbbreviationInPngFileName(input_api, output_api):
-  """Makes sure there are no abbreviations in the name of PNG files.
-  """
-  pattern = input_api.re.compile(r'.*_[a-z]_.*\.png$|.*_[a-z]\.png$')
-  errors = []
-  for f in input_api.AffectedFiles(include_deletes=False):
-    if pattern.match(f.LocalPath()):
-      errors.append('    %s' % f.LocalPath())
-
-  results = []
-  if errors:
-    results.append(output_api.PresubmitError(
-        'The name of PNG files should not have abbreviations. \n'
-        'Use _hover.png, _center.png, instead of _h.png, _c.png.\n'
-        'Contact oshima@chromium.org if you have questions.', errors))
-  return results
-
-
-def _FilesToCheckForIncomingDeps(re, changed_lines):
-  """Helper method for _CheckAddedDepsHaveTargetApprovals. Returns
-  a set of DEPS entries that we should look up.
-
-  For a directory (rather than a specific filename) we fake a path to
-  a specific filename by adding /DEPS. This is chosen as a file that
-  will seldom or never be subject to per-file include_rules.
-  """
-  # We ignore deps entries on auto-generated directories.
-  AUTO_GENERATED_DIRS = ['grit', 'jni']
-
-  # This pattern grabs the path without basename in the first
-  # parentheses, and the basename (if present) in the second. It
-  # relies on the simple heuristic that if there is a basename it will
-  # be a header file ending in ".h".
-  pattern = re.compile(
-      r"""['"]\+([^'"]+?)(/[a-zA-Z0-9_]+\.h)?['"].*""")
-  results = set()
-  for changed_line in changed_lines:
-    m = pattern.match(changed_line)
-    if m:
-      path = m.group(1)
-      if path.split('/')[0] not in AUTO_GENERATED_DIRS:
-        if m.group(2):
-          results.add('%s%s' % (path, m.group(2)))
-        else:
-          results.add('%s/DEPS' % path)
-  return results
-
-
-def _CheckAddedDepsHaveTargetApprovals(input_api, output_api):
-  """When a dependency prefixed with + is added to a DEPS file, we
-  want to make sure that the change is reviewed by an OWNER of the
-  target file or directory, to avoid layering violations from being
-  introduced. This check verifies that this happens.
-  """
-  changed_lines = set()
-  for f in input_api.AffectedFiles():
-    filename = input_api.os_path.basename(f.LocalPath())
-    if filename == 'DEPS':
-      changed_lines |= set(line.strip()
-                           for line_num, line
-                           in f.ChangedContents())
-  if not changed_lines:
-    return []
-
-  virtual_depended_on_files = _FilesToCheckForIncomingDeps(input_api.re,
-                                                           changed_lines)
-  if not virtual_depended_on_files:
-    return []
-
-  if input_api.is_committing:
-    if input_api.tbr:
-      return [output_api.PresubmitNotifyResult(
-          '--tbr was specified, skipping OWNERS check for DEPS additions')]
-    if not input_api.change.issue:
-      return [output_api.PresubmitError(
-          "DEPS approval by OWNERS check failed: this change has "
-          "no Rietveld issue number, so we can't check it for approvals.")]
-    output = output_api.PresubmitError
-  else:
-    output = output_api.PresubmitNotifyResult
-
-  owners_db = input_api.owners_db
-  owner_email, reviewers = input_api.canned_checks._RietveldOwnerAndReviewers(
-      input_api,
-      owners_db.email_regexp,
-      approval_needed=input_api.is_committing)
-
-  owner_email = owner_email or input_api.change.author_email
-
-  reviewers_plus_owner = set(reviewers)
-  if owner_email:
-    reviewers_plus_owner.add(owner_email)
-  missing_files = owners_db.files_not_covered_by(virtual_depended_on_files,
-                                                 reviewers_plus_owner)
-
-  # We strip the /DEPS part that was added by
-  # _FilesToCheckForIncomingDeps to fake a path to a file in a
-  # directory.
-  def StripDeps(path):
-    start_deps = path.rfind('/DEPS')
-    if start_deps != -1:
-      return path[:start_deps]
-    else:
-      return path
-  unapproved_dependencies = ["'+%s'," % StripDeps(path)
-                             for path in missing_files]
-
-  if unapproved_dependencies:
-    output_list = [
-      output('Missing LGTM from OWNERS of dependencies added to DEPS:\n    %s' %
-             '\n    '.join(sorted(unapproved_dependencies)))]
-    if not input_api.is_committing:
-      suggested_owners = owners_db.reviewers_for(missing_files, owner_email)
-      output_list.append(output(
-          'Suggested missing target path OWNERS:\n    %s' %
-          '\n    '.join(suggested_owners or [])))
-    return output_list
-
-  return []
-
-
-def _CheckSpamLogging(input_api, output_api):
-  file_inclusion_pattern = r'.+%s' % _IMPLEMENTATION_EXTENSIONS
-  black_list = (_EXCLUDED_PATHS +
-                _TEST_CODE_EXCLUDED_PATHS +
-                input_api.DEFAULT_BLACK_LIST +
-                (r"^base[\\\/]logging\.h$",
-                 r"^base[\\\/]logging\.cc$",
-                 r"^chrome[\\\/]app[\\\/]chrome_main_delegate\.cc$",
-                 r"^chrome[\\\/]browser[\\\/]chrome_browser_main\.cc$",
-                 r"^chrome[\\\/]browser[\\\/]ui[\\\/]startup[\\\/]"
-                     r"startup_browser_creator\.cc$",
-                 r"^chrome[\\\/]installer[\\\/]setup[\\\/].*",
-                 r"chrome[\\\/]browser[\\\/]diagnostics[\\\/]" +
-                     r"diagnostics_writer\.cc$",
-                 r"^chrome_elf[\\\/]dll_hash[\\\/]dll_hash_main\.cc$",
-                 r"^chromecast[\\\/]",
-                 r"^cloud_print[\\\/]",
-                 r"^content[\\\/]common[\\\/]gpu[\\\/]client[\\\/]"
-                     r"gl_helper_benchmark\.cc$",
-                 r"^courgette[\\\/]courgette_tool\.cc$",
-                 r"^extensions[\\\/]renderer[\\\/]logging_native_handler\.cc$",
-                 r"^native_client_sdk[\\\/]",
-                 r"^remoting[\\\/]base[\\\/]logging\.h$",
-                 r"^remoting[\\\/]host[\\\/].*",
-                 r"^sandbox[\\\/]linux[\\\/].*",
-                 r"^tools[\\\/]",
-                 r"^ui[\\\/]aura[\\\/]bench[\\\/]bench_main\.cc$",
-                 r"^webkit[\\\/]browser[\\\/]fileapi[\\\/]" +
-                     r"dump_file_system.cc$",))
-  source_file_filter = lambda x: input_api.FilterSourceFile(
-      x, white_list=(file_inclusion_pattern,), black_list=black_list)
-
-  log_info = []
-  printf = []
-
-  for f in input_api.AffectedSourceFiles(source_file_filter):
-    contents = input_api.ReadFile(f, 'rb')
-    if re.search(r"\bD?LOG\s*\(\s*INFO\s*\)", contents):
-      log_info.append(f.LocalPath())
-    elif re.search(r"\bD?LOG_IF\s*\(\s*INFO\s*,", contents):
-      log_info.append(f.LocalPath())
-
-    if re.search(r"\bprintf\(", contents):
-      printf.append(f.LocalPath())
-    elif re.search(r"\bfprintf\((stdout|stderr)", contents):
-      printf.append(f.LocalPath())
-
-  if log_info:
-    return [output_api.PresubmitError(
-      'These files spam the console log with LOG(INFO):',
-      items=log_info)]
-  if printf:
-    return [output_api.PresubmitError(
-      'These files spam the console log with printf/fprintf:',
-      items=printf)]
-  return []
-
-
-def _CheckForAnonymousVariables(input_api, output_api):
-  """These types are all expected to hold locks while in scope and
-     so should never be anonymous (which causes them to be immediately
-     destroyed)."""
-  they_who_must_be_named = [
-    'base::AutoLock',
-    'base::AutoReset',
-    'base::AutoUnlock',
-    'SkAutoAlphaRestore',
-    'SkAutoBitmapShaderInstall',
-    'SkAutoBlitterChoose',
-    'SkAutoBounderCommit',
-    'SkAutoCallProc',
-    'SkAutoCanvasRestore',
-    'SkAutoCommentBlock',
-    'SkAutoDescriptor',
-    'SkAutoDisableDirectionCheck',
-    'SkAutoDisableOvalCheck',
-    'SkAutoFree',
-    'SkAutoGlyphCache',
-    'SkAutoHDC',
-    'SkAutoLockColors',
-    'SkAutoLockPixels',
-    'SkAutoMalloc',
-    'SkAutoMaskFreeImage',
-    'SkAutoMutexAcquire',
-    'SkAutoPathBoundsUpdate',
-    'SkAutoPDFRelease',
-    'SkAutoRasterClipValidate',
-    'SkAutoRef',
-    'SkAutoTime',
-    'SkAutoTrace',
-    'SkAutoUnref',
-  ]
-  anonymous = r'(%s)\s*[({]' % '|'.join(they_who_must_be_named)
-  # bad: base::AutoLock(lock.get());
-  # not bad: base::AutoLock lock(lock.get());
-  bad_pattern = input_api.re.compile(anonymous)
-  # good: new base::AutoLock(lock.get())
-  good_pattern = input_api.re.compile(r'\bnew\s*' + anonymous)
-  errors = []
-
-  for f in input_api.AffectedFiles():
-    if not f.LocalPath().endswith(('.cc', '.h', '.inl', '.m', '.mm')):
-      continue
-    for linenum, line in f.ChangedContents():
-      if bad_pattern.search(line) and not good_pattern.search(line):
-        errors.append('%s:%d' % (f.LocalPath(), linenum))
-
-  if errors:
-    return [output_api.PresubmitError(
-      'These lines create anonymous variables that need to be named:',
-      items=errors)]
-  return []
-
-
-def _CheckCygwinShell(input_api, output_api):
-  source_file_filter = lambda x: input_api.FilterSourceFile(
-      x, white_list=(r'.+\.(gyp|gypi)$',))
-  cygwin_shell = []
-
-  for f in input_api.AffectedSourceFiles(source_file_filter):
-    for linenum, line in f.ChangedContents():
-      if 'msvs_cygwin_shell' in line:
-        cygwin_shell.append(f.LocalPath())
-        break
-
-  if cygwin_shell:
-    return [output_api.PresubmitError(
-      'These files should not use msvs_cygwin_shell (the default is 0):',
-      items=cygwin_shell)]
-  return []
-
-
-def _CheckUserActionUpdate(input_api, output_api):
-  """Checks if any new user action has been added."""
-  if any('actions.xml' == input_api.os_path.basename(f) for f in
-         input_api.LocalPaths()):
-    # If actions.xml is already included in the changelist, the PRESUBMIT
-    # for actions.xml will do a more complete presubmit check.
-    return []
-
-  file_filter = lambda f: f.LocalPath().endswith(('.cc', '.mm'))
-  action_re = r'[^a-zA-Z]UserMetricsAction\("([^"]*)'
-  current_actions = None
-  for f in input_api.AffectedFiles(file_filter=file_filter):
-    for line_num, line in f.ChangedContents():
-      match = input_api.re.search(action_re, line)
-      if match:
-        # Loads contents in tools/metrics/actions/actions.xml to memory. It's
-        # loaded only once.
-        if not current_actions:
-          with open('tools/metrics/actions/actions.xml') as actions_f:
-            current_actions = actions_f.read()
-        # Search for the matched user action name in |current_actions|.
-        for action_name in match.groups():
-          action = 'name="{0}"'.format(action_name)
-          if action not in current_actions:
-            return [output_api.PresubmitPromptWarning(
-              'File %s line %d: %s is missing in '
-              'tools/metrics/actions/actions.xml. Please run '
-              'tools/metrics/actions/extract_actions.py to update.'
-              % (f.LocalPath(), line_num, action_name))]
-  return []
-
-
-def _GetJSONParseError(input_api, filename, eat_comments=True):
-  try:
-    contents = input_api.ReadFile(filename)
-    if eat_comments:
-      json_comment_eater = input_api.os_path.join(
-          input_api.PresubmitLocalPath(),
-          'tools', 'json_comment_eater', 'json_comment_eater.py')
-      process = input_api.subprocess.Popen(
-          [input_api.python_executable, json_comment_eater],
-          stdin=input_api.subprocess.PIPE,
-          stdout=input_api.subprocess.PIPE,
-          universal_newlines=True)
-      (contents, _) = process.communicate(input=contents)
-
-    input_api.json.loads(contents)
-  except ValueError as e:
-    return e
-  return None
-
-
-def _GetIDLParseError(input_api, filename):
-  try:
-    contents = input_api.ReadFile(filename)
-    idl_schema = input_api.os_path.join(
-        input_api.PresubmitLocalPath(),
-        'tools', 'json_schema_compiler', 'idl_schema.py')
-    process = input_api.subprocess.Popen(
-        [input_api.python_executable, idl_schema],
-        stdin=input_api.subprocess.PIPE,
-        stdout=input_api.subprocess.PIPE,
-        stderr=input_api.subprocess.PIPE,
-        universal_newlines=True)
-    (_, error) = process.communicate(input=contents)
-    return error or None
-  except ValueError as e:
-    return e
-
-
-def _CheckParseErrors(input_api, output_api):
-  """Check that IDL and JSON files do not contain syntax errors."""
-  actions = {
-    '.idl': _GetIDLParseError,
-    '.json': _GetJSONParseError,
-  }
-  # These paths contain test data and other known invalid JSON files.
-  excluded_patterns = [
-    r'test[\\\/]data[\\\/]',
-    r'^components[\\\/]policy[\\\/]resources[\\\/]policy_templates\.json$',
-  ]
-  # Most JSON files are preprocessed and support comments, but these do not.
-  json_no_comments_patterns = [
-    r'^testing[\\\/]',
-  ]
-  # Only run IDL checker on files in these directories.
-  idl_included_patterns = [
-    r'^chrome[\\\/]common[\\\/]extensions[\\\/]api[\\\/]',
-    r'^extensions[\\\/]common[\\\/]api[\\\/]',
-  ]
-
-  def get_action(affected_file):
-    filename = affected_file.LocalPath()
-    return actions.get(input_api.os_path.splitext(filename)[1])
-
-  def MatchesFile(patterns, path):
-    for pattern in patterns:
-      if input_api.re.search(pattern, path):
-        return True
-    return False
-
-  def FilterFile(affected_file):
-    action = get_action(affected_file)
-    if not action:
-      return False
-    path = affected_file.LocalPath()
-
-    if MatchesFile(excluded_patterns, path):
-      return False
-
-    if (action == _GetIDLParseError and
-        not MatchesFile(idl_included_patterns, path)):
-      return False
-    return True
-
-  results = []
-  for affected_file in input_api.AffectedFiles(
-      file_filter=FilterFile, include_deletes=False):
-    action = get_action(affected_file)
-    kwargs = {}
-    if (action == _GetJSONParseError and
-        MatchesFile(json_no_comments_patterns, affected_file.LocalPath())):
-      kwargs['eat_comments'] = False
-    parse_error = action(input_api,
-                         affected_file.AbsoluteLocalPath(),
-                         **kwargs)
-    if parse_error:
-      results.append(output_api.PresubmitError('%s could not be parsed: %s' %
-          (affected_file.LocalPath(), parse_error)))
-  return results
-
-
-def _CheckJavaStyle(input_api, output_api):
-  """Runs checkstyle on changed java files and returns errors if any exist."""
-  original_sys_path = sys.path
-  try:
-    sys.path = sys.path + [input_api.os_path.join(
-        input_api.PresubmitLocalPath(), 'tools', 'android', 'checkstyle')]
-    import checkstyle
-  finally:
-    # Restore sys.path to what it was before.
-    sys.path = original_sys_path
-
-  return checkstyle.RunCheckstyle(
-      input_api, output_api, 'tools/android/checkstyle/chromium-style-5.0.xml')
-
-
-_DEPRECATED_CSS = [
-  # Values
-  ( "-webkit-box", "flex" ),
-  ( "-webkit-inline-box", "inline-flex" ),
-  ( "-webkit-flex", "flex" ),
-  ( "-webkit-inline-flex", "inline-flex" ),
-  ( "-webkit-min-content", "min-content" ),
-  ( "-webkit-max-content", "max-content" ),
-
-  # Properties
-  ( "-webkit-background-clip", "background-clip" ),
-  ( "-webkit-background-origin", "background-origin" ),
-  ( "-webkit-background-size", "background-size" ),
-  ( "-webkit-box-shadow", "box-shadow" ),
-
-  # Functions
-  ( "-webkit-gradient", "gradient" ),
-  ( "-webkit-repeating-gradient", "repeating-gradient" ),
-  ( "-webkit-linear-gradient", "linear-gradient" ),
-  ( "-webkit-repeating-linear-gradient", "repeating-linear-gradient" ),
-  ( "-webkit-radial-gradient", "radial-gradient" ),
-  ( "-webkit-repeating-radial-gradient", "repeating-radial-gradient" ),
-]
-
-def _CheckNoDeprecatedCSS(input_api, output_api):
-  """ Make sure that we don't use deprecated CSS
-      properties, functions or values. Our external
-      documentation is ignored by the hooks as it
-      needs to be consumed by WebKit. """
-  results = []
-  file_inclusion_pattern = (r".+\.css$")
-  black_list = (_EXCLUDED_PATHS +
-                _TEST_CODE_EXCLUDED_PATHS +
-                input_api.DEFAULT_BLACK_LIST +
-                (r"^chrome/common/extensions/docs",
-                 r"^chrome/docs",
-                 r"^native_client_sdk"))
-  file_filter = lambda f: input_api.FilterSourceFile(
-      f, white_list=file_inclusion_pattern, black_list=black_list)
-  for fpath in input_api.AffectedFiles(file_filter=file_filter):
-    for line_num, line in fpath.ChangedContents():
-      for (deprecated_value, value) in _DEPRECATED_CSS:
-        if input_api.re.search(deprecated_value, line):
-          results.append(output_api.PresubmitError(
-              "%s:%d: Use of deprecated CSS %s, use %s instead" %
-              (fpath.LocalPath(), line_num, deprecated_value, value)))
-  return results
-
-def _CommonChecks(input_api, output_api):
-  """Checks common to both upload and commit."""
-  results = []
-  results.extend(input_api.canned_checks.PanProjectChecks(
-      input_api, output_api,
-      excluded_paths=_EXCLUDED_PATHS + _TESTRUNNER_PATHS))
-  results.extend(_CheckAuthorizedAuthor(input_api, output_api))
-  results.extend(
-      _CheckNoProductionCodeUsingTestOnlyFunctions(input_api, output_api))
-  results.extend(_CheckNoIOStreamInHeaders(input_api, output_api))
-  results.extend(_CheckNoUNIT_TESTInSourceFiles(input_api, output_api))
-  results.extend(_CheckNoNewWStrings(input_api, output_api))
-  results.extend(_CheckNoDEPSGIT(input_api, output_api))
-  results.extend(_CheckNoBannedFunctions(input_api, output_api))
-  results.extend(_CheckNoPragmaOnce(input_api, output_api))
-  results.extend(_CheckNoTrinaryTrueFalse(input_api, output_api))
-  results.extend(_CheckUnwantedDependencies(input_api, output_api))
-  results.extend(_CheckFilePermissions(input_api, output_api))
-  results.extend(_CheckNoAuraWindowPropertyHInHeaders(input_api, output_api))
-  results.extend(_CheckIncludeOrder(input_api, output_api))
-  results.extend(_CheckForVersionControlConflicts(input_api, output_api))
-  results.extend(_CheckPatchFiles(input_api, output_api))
-  results.extend(_CheckHardcodedGoogleHostsInLowerLayers(input_api, output_api))
-  results.extend(_CheckNoAbbreviationInPngFileName(input_api, output_api))
-  results.extend(_CheckForInvalidOSMacros(input_api, output_api))
-  results.extend(_CheckAddedDepsHaveTargetApprovals(input_api, output_api))
-  results.extend(
-      input_api.canned_checks.CheckChangeHasNoTabs(
-          input_api,
-          output_api,
-          source_file_filter=lambda x: x.LocalPath().endswith('.grd')))
-  results.extend(_CheckSpamLogging(input_api, output_api))
-  results.extend(_CheckForAnonymousVariables(input_api, output_api))
-  results.extend(_CheckCygwinShell(input_api, output_api))
-  results.extend(_CheckUserActionUpdate(input_api, output_api))
-  results.extend(_CheckNoDeprecatedCSS(input_api, output_api))
-  results.extend(_CheckParseErrors(input_api, output_api))
-
-  if any('PRESUBMIT.py' == f.LocalPath() for f in input_api.AffectedFiles()):
-    results.extend(input_api.canned_checks.RunUnitTestsInDirectory(
-        input_api, output_api,
-        input_api.PresubmitLocalPath(),
-        whitelist=[r'^PRESUBMIT_test\.py$']))
-  return results
-
-
-def _CheckAuthorizedAuthor(input_api, output_api):
-  """For non-googler/chromites committers, verify the author's email address is
-  in AUTHORS.
-  """
-  # TODO(maruel): Add it to input_api?
-  import fnmatch
-
-  author = input_api.change.author_email
-  if not author:
-    input_api.logging.info('No author, skipping AUTHOR check')
-    return []
-  authors_path = input_api.os_path.join(
-      input_api.PresubmitLocalPath(), 'AUTHORS')
-  valid_authors = (
-      input_api.re.match(r'[^#]+\s+\<(.+?)\>\s*$', line)
-      for line in open(authors_path))
-  valid_authors = [item.group(1).lower() for item in valid_authors if item]
-  if not any(fnmatch.fnmatch(author.lower(), valid) for valid in valid_authors):
-    input_api.logging.info('Valid authors are %s', ', '.join(valid_authors))
-    return [output_api.PresubmitPromptWarning(
-        ('%s is not in AUTHORS file. If you are a new contributor, please visit'
-        '\n'
-        'http://www.chromium.org/developers/contributing-code and read the '
-        '"Legal" section\n'
-        'If you are a chromite, verify the contributor signed the CLA.') %
-        author)]
-  return []
-
-
-def _CheckPatchFiles(input_api, output_api):
-  problems = [f.LocalPath() for f in input_api.AffectedFiles()
-      if f.LocalPath().endswith(('.orig', '.rej'))]
-  if problems:
-    return [output_api.PresubmitError(
-        "Don't commit .rej and .orig files.", problems)]
-  else:
-    return []
-
-
-def _DidYouMeanOSMacro(bad_macro):
-  try:
-    return {'A': 'OS_ANDROID',
-            'B': 'OS_BSD',
-            'C': 'OS_CHROMEOS',
-            'F': 'OS_FREEBSD',
-            'L': 'OS_LINUX',
-            'M': 'OS_MACOSX',
-            'N': 'OS_NACL',
-            'O': 'OS_OPENBSD',
-            'P': 'OS_POSIX',
-            'S': 'OS_SOLARIS',
-            'W': 'OS_WIN'}[bad_macro[3].upper()]
-  except KeyError:
-    return ''
-
-
-def _CheckForInvalidOSMacrosInFile(input_api, f):
-  """Check for sensible looking, totally invalid OS macros."""
-  preprocessor_statement = input_api.re.compile(r'^\s*#')
-  os_macro = input_api.re.compile(r'defined\((OS_[^)]+)\)')
-  results = []
-  for lnum, line in f.ChangedContents():
-    if preprocessor_statement.search(line):
-      for match in os_macro.finditer(line):
-        if not match.group(1) in _VALID_OS_MACROS:
-          good = _DidYouMeanOSMacro(match.group(1))
-          did_you_mean = ' (did you mean %s?)' % good if good else ''
-          results.append('    %s:%d %s%s' % (f.LocalPath(),
-                                             lnum,
-                                             match.group(1),
-                                             did_you_mean))
-  return results
-
-
-def _CheckForInvalidOSMacros(input_api, output_api):
-  """Check all affected files for invalid OS macros."""
-  bad_macros = []
-  for f in input_api.AffectedFiles():
-    if not f.LocalPath().endswith(('.py', '.js', '.html', '.css')):
-      bad_macros.extend(_CheckForInvalidOSMacrosInFile(input_api, f))
-
-  if not bad_macros:
-    return []
-
-  return [output_api.PresubmitError(
-      'Possibly invalid OS macro[s] found. Please fix your code\n'
-      'or add your macro to src/PRESUBMIT.py.', bad_macros)]
-
-
-def CheckChangeOnUpload(input_api, output_api):
-  results = []
-  results.extend(_CommonChecks(input_api, output_api))
-  results.extend(_CheckJavaStyle(input_api, output_api))
-  return results
-
-
-def GetTryServerMasterForBot(bot):
-  """Returns the Try Server master for the given bot.
-
-  It tries to guess the master from the bot name, but may still fail
-  and return None.  There is no longer a default master.
-  """
-  # Potentially ambiguous bot names are listed explicitly.
-  master_map = {
-      'linux_gpu': 'tryserver.chromium.gpu',
-      'mac_gpu': 'tryserver.chromium.gpu',
-      'win_gpu': 'tryserver.chromium.gpu',
-      'chromium_presubmit': 'tryserver.chromium.linux',
-      'blink_presubmit': 'tryserver.chromium.linux',
-      'tools_build_presubmit': 'tryserver.chromium.linux',
-  }
-  master = master_map.get(bot)
-  if not master:
-    if 'gpu' in bot:
-      master = 'tryserver.chromium.gpu'
-    elif 'linux' in bot or 'android' in bot or 'presubmit' in bot:
-      master = 'tryserver.chromium.linux'
-    elif 'win' in bot:
-      master = 'tryserver.chromium.win'
-    elif 'mac' in bot or 'ios' in bot:
-      master = 'tryserver.chromium.mac'
-  return master
-
-
-def GetDefaultTryConfigs(bots=None):
-  """Returns a list of ('bot', set(['tests']), optionally filtered by [bots].
-
-  To add tests to this list, they MUST be in the the corresponding master's
-  gatekeeper config. For example, anything on master.chromium would be closed by
-  tools/build/masters/master.chromium/master_gatekeeper_cfg.py.
-
-  If 'bots' is specified, will only return configurations for bots in that list.
-  """
-
-  standard_tests = [
-      'base_unittests',
-      'browser_tests',
-      'cacheinvalidation_unittests',
-      'check_deps',
-      'check_deps2git',
-      'content_browsertests',
-      'content_unittests',
-      'crypto_unittests',
-      'gpu_unittests',
-      'interactive_ui_tests',
-      'ipc_tests',
-      'jingle_unittests',
-      'media_unittests',
-      'net_unittests',
-      'ppapi_unittests',
-      'printing_unittests',
-      'sql_unittests',
-      'sync_unit_tests',
-      'unit_tests',
-      # Broken in release.
-      #'url_unittests',
-      #'webkit_unit_tests',
-  ]
-
-  builders_and_tests = {
-      # TODO(maruel): Figure out a way to run 'sizes' where people can
-      # effectively update the perf expectation correctly.  This requires a
-      # clobber=True build running 'sizes'. 'sizes' is not accurate with
-      # incremental build. Reference:
-      # http://chromium.org/developers/tree-sheriffs/perf-sheriffs.
-      # TODO(maruel): An option would be to run 'sizes' but not count a failure
-      # of this step as a try job failure.
-      'android_aosp': ['compile'],
-      'android_chromium_gn_compile_rel': ['compile'],
-      'android_clang_dbg': ['slave_steps'],
-      'android_dbg_tests_recipe': ['slave_steps'],
-      'cros_x86': ['defaulttests'],
-      'ios_dbg_simulator': [
-          'compile',
-          'base_unittests',
-          'content_unittests',
-          'crypto_unittests',
-          'url_unittests',
-          'net_unittests',
-          'sql_unittests',
-          'ui_unittests',
-      ],
-      'ios_rel_device': ['compile'],
-      'linux_asan': ['compile'],
-      'mac_asan': ['compile'],
-      #TODO(stip): Change the name of this builder to reflect that it's release.
-      'linux_gtk': standard_tests,
-      'linux_chromeos_asan': ['compile'],
-      'linux_chromium_chromeos_clang_dbg': ['defaulttests'],
-      'linux_chromium_chromeos_rel_swarming': ['defaulttests'],
-      'linux_chromium_compile_dbg': ['defaulttests'],
-      'linux_chromium_gn_rel': ['defaulttests'],
-      'linux_chromium_rel_swarming': ['defaulttests'],
-      'linux_chromium_clang_dbg': ['defaulttests'],
-      'linux_gpu': ['defaulttests'],
-      'linux_nacl_sdk_build': ['compile'],
-      'mac_chromium_compile_dbg': ['defaulttests'],
-      'mac_chromium_rel_swarming': ['defaulttests'],
-      'mac_gpu': ['defaulttests'],
-      'mac_nacl_sdk_build': ['compile'],
-      'win_chromium_compile_dbg': ['defaulttests'],
-      'win_chromium_dbg': ['defaulttests'],
-      'win_chromium_rel_swarming': ['defaulttests'],
-      'win_chromium_x64_rel_swarming': ['defaulttests'],
-      'win_gpu': ['defaulttests'],
-      'win_nacl_sdk_build': ['compile'],
-  }
-
-  if bots:
-    filtered_builders_and_tests = dict((bot, set(builders_and_tests[bot]))
-                                       for bot in bots)
-  else:
-    filtered_builders_and_tests = dict(
-        (bot, set(tests))
-        for bot, tests in builders_and_tests.iteritems())
-
-  # Build up the mapping from tryserver master to bot/test.
-  out = dict()
-  for bot, tests in filtered_builders_and_tests.iteritems():
-    out.setdefault(GetTryServerMasterForBot(bot), {})[bot] = tests
-  return out
-
-
-def CheckChangeOnCommit(input_api, output_api):
-  results = []
-  results.extend(_CommonChecks(input_api, output_api))
-  # TODO(thestig) temporarily disabled, doesn't work in third_party/
-  #results.extend(input_api.canned_checks.CheckSvnModifiedDirectories(
-  #    input_api, output_api, sources))
-  # Make sure the tree is 'open'.
-  results.extend(input_api.canned_checks.CheckTreeIsOpen(
-      input_api,
-      output_api,
-      json_url='http://chromium-status.appspot.com/current?format=json'))
-
-  results.extend(input_api.canned_checks.CheckChangeHasBugField(
-      input_api, output_api))
-  results.extend(input_api.canned_checks.CheckChangeHasDescription(
-      input_api, output_api))
-  return results
-
-
-def GetPreferredTryMasters(project, change):
-  files = change.LocalPaths()
-
-  if not files or all(re.search(r'[\\\/]OWNERS$', f) for f in files):
-    return {}
-
-  if all(re.search(r'\.(m|mm)$|(^|[\\\/_])mac[\\\/_.]', f) for f in files):
-    return GetDefaultTryConfigs([
-        'mac_chromium_compile_dbg',
-        'mac_chromium_rel_swarming',
-    ])
-  if all(re.search('(^|[/_])win[/_.]', f) for f in files):
-    return GetDefaultTryConfigs([
-        'win_chromium_dbg',
-        'win_chromium_rel_swarming',
-    ])
-  if all(re.search(r'(^|[\\\/_])android[\\\/_.]', f) for f in files):
-    return GetDefaultTryConfigs([
-        'android_aosp',
-        'android_clang_dbg',
-        'android_dbg_tests_recipe',
-    ])
-  if all(re.search(r'[\\\/_]ios[\\\/_.]', f) for f in files):
-    return GetDefaultTryConfigs(['ios_rel_device', 'ios_dbg_simulator'])
-
-  builders = [
-      'android_chromium_gn_compile_rel',
-      'android_clang_dbg',
-      'android_dbg_tests_recipe',
-      'ios_dbg_simulator',
-      'ios_rel_device',
-      'linux_chromium_chromeos_rel_swarming',
-      'linux_chromium_clang_dbg',
-      'linux_chromium_gn_rel',
-      'linux_chromium_rel_swarming',
-      'linux_gpu',
-      'mac_chromium_compile_dbg',
-      'mac_chromium_rel_swarming',
-      'mac_gpu',
-      'win_chromium_compile_dbg',
-      'win_chromium_rel_swarming',
-      'win_chromium_x64_rel_swarming',
-      'win_gpu',
-  ]
-
-  # Match things like path/aura/file.cc and path/file_aura.cc.
-  # Same for chromeos.
-  if any(re.search(r'[\\\/_](aura|chromeos)', f) for f in files):
-    builders.extend([
-        'linux_chromeos_asan',
-        'linux_chromium_chromeos_clang_dbg'
-    ])
-
-  # If there are gyp changes to base, build, or chromeos, run a full cros build
-  # in addition to the shorter linux_chromeos build. Changes to high level gyp
-  # files have a much higher chance of breaking the cros build, which is
-  # differnt from the linux_chromeos build that most chrome developers test
-  # with.
-  if any(re.search('^(base|build|chromeos).*\.gypi?$', f) for f in files):
-    builders.extend(['cros_x86'])
-
-  # The AOSP bot doesn't build the chrome/ layer, so ignore any changes to it
-  # unless they're .gyp(i) files as changes to those files can break the gyp
-  # step on that bot.
-  if (not all(re.search('^chrome', f) for f in files) or
-      any(re.search('\.gypi?$', f) for f in files)):
-    builders.extend(['android_aosp'])
-
-  return GetDefaultTryConfigs(builders)
diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
deleted file mode 100755
index dd67eb1a..0000000
--- a/PRESUBMIT_test.py
+++ /dev/null
@@ -1,765 +0,0 @@
-#!/usr/bin/env python
-# 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.
-
-import glob
-import json
-import os
-import re
-import subprocess
-import sys
-import unittest
-
-import PRESUBMIT
-
-
-_TEST_DATA_DIR = 'base/test/data/presubmit'
-
-
-class MockInputApi(object):
-  def __init__(self):
-    self.json = json
-    self.re = re
-    self.os_path = os.path
-    self.python_executable = sys.executable
-    self.subprocess = subprocess
-    self.files = []
-    self.is_committing = False
-
-  def AffectedFiles(self, file_filter=None):
-    return self.files
-
-  def PresubmitLocalPath(self):
-    return os.path.dirname(__file__)
-
-  def ReadFile(self, filename, mode='rU'):
-    for file_ in self.files:
-      if file_.LocalPath() == filename:
-        return '\n'.join(file_.NewContents())
-    # Otherwise, file is not in our mock API.
-    raise IOError, "No such file or directory: '%s'" % filename
-
-
-class MockOutputApi(object):
-  class PresubmitResult(object):
-    def __init__(self, message, items=None, long_text=''):
-      self.message = message
-      self.items = items
-      self.long_text = long_text
-
-  class PresubmitError(PresubmitResult):
-    def __init__(self, message, items, long_text=''):
-      MockOutputApi.PresubmitResult.__init__(self, message, items, long_text)
-      self.type = 'error'
-
-  class PresubmitPromptWarning(PresubmitResult):
-    def __init__(self, message, items, long_text=''):
-      MockOutputApi.PresubmitResult.__init__(self, message, items, long_text)
-      self.type = 'warning'
-
-  class PresubmitNotifyResult(PresubmitResult):
-    def __init__(self, message, items, long_text=''):
-      MockOutputApi.PresubmitResult.__init__(self, message, items, long_text)
-      self.type = 'notify'
-
-  class PresubmitPromptOrNotify(PresubmitResult):
-    def __init__(self, message, items, long_text=''):
-      MockOutputApi.PresubmitResult.__init__(self, message, items, long_text)
-      self.type = 'promptOrNotify'
-
-
-class MockFile(object):
-  def __init__(self, local_path, new_contents):
-    self._local_path = local_path
-    self._new_contents = new_contents
-    self._changed_contents = [(i + 1, l) for i, l in enumerate(new_contents)]
-
-  def ChangedContents(self):
-    return self._changed_contents
-
-  def NewContents(self):
-    return self._new_contents
-
-  def LocalPath(self):
-    return self._local_path
-
-
-class MockChange(object):
-  def __init__(self, changed_files):
-    self._changed_files = changed_files
-
-  def LocalPaths(self):
-    return self._changed_files
-
-
-class IncludeOrderTest(unittest.TestCase):
-  def testSystemHeaderOrder(self):
-    scope = [(1, '#include <csystem.h>'),
-             (2, '#include <cppsystem>'),
-             (3, '#include "acustom.h"')]
-    all_linenums = [linenum for (linenum, _) in scope]
-    mock_input_api = MockInputApi()
-    warnings = PRESUBMIT._CheckIncludeOrderForScope(scope, mock_input_api,
-                                                    '', all_linenums)
-    self.assertEqual(0, len(warnings))
-
-  def testSystemHeaderOrderMismatch1(self):
-    scope = [(10, '#include <cppsystem>'),
-             (20, '#include <csystem.h>'),
-             (30, '#include "acustom.h"')]
-    all_linenums = [linenum for (linenum, _) in scope]
-    mock_input_api = MockInputApi()
-    warnings = PRESUBMIT._CheckIncludeOrderForScope(scope, mock_input_api,
-                                                    '', all_linenums)
-    self.assertEqual(1, len(warnings))
-    self.assertTrue('20' in warnings[0])
-
-  def testSystemHeaderOrderMismatch2(self):
-    scope = [(10, '#include <cppsystem>'),
-             (20, '#include "acustom.h"'),
-             (30, '#include <csystem.h>')]
-    all_linenums = [linenum for (linenum, _) in scope]
-    mock_input_api = MockInputApi()
-    warnings = PRESUBMIT._CheckIncludeOrderForScope(scope, mock_input_api,
-                                                    '', all_linenums)
-    self.assertEqual(1, len(warnings))
-    self.assertTrue('30' in warnings[0])
-
-  def testSystemHeaderOrderMismatch3(self):
-    scope = [(10, '#include "acustom.h"'),
-             (20, '#include <csystem.h>'),
-             (30, '#include <cppsystem>')]
-    all_linenums = [linenum for (linenum, _) in scope]
-    mock_input_api = MockInputApi()
-    warnings = PRESUBMIT._CheckIncludeOrderForScope(scope, mock_input_api,
-                                                    '', all_linenums)
-    self.assertEqual(2, len(warnings))
-    self.assertTrue('20' in warnings[0])
-    self.assertTrue('30' in warnings[1])
-
-  def testAlphabeticalOrderMismatch(self):
-    scope = [(10, '#include <csystem.h>'),
-             (15, '#include <bsystem.h>'),
-             (20, '#include <cppsystem>'),
-             (25, '#include <bppsystem>'),
-             (30, '#include "bcustom.h"'),
-             (35, '#include "acustom.h"')]
-    all_linenums = [linenum for (linenum, _) in scope]
-    mock_input_api = MockInputApi()
-    warnings = PRESUBMIT._CheckIncludeOrderForScope(scope, mock_input_api,
-                                                    '', all_linenums)
-    self.assertEqual(3, len(warnings))
-    self.assertTrue('15' in warnings[0])
-    self.assertTrue('25' in warnings[1])
-    self.assertTrue('35' in warnings[2])
-
-  def testSpecialFirstInclude1(self):
-    mock_input_api = MockInputApi()
-    contents = ['#include "some/path/foo.h"',
-                '#include "a/header.h"']
-    mock_file = MockFile('some/path/foo.cc', contents)
-    warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(0, len(warnings))
-
-  def testSpecialFirstInclude2(self):
-    mock_input_api = MockInputApi()
-    contents = ['#include "some/other/path/foo.h"',
-                '#include "a/header.h"']
-    mock_file = MockFile('some/path/foo.cc', contents)
-    warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(0, len(warnings))
-
-  def testSpecialFirstInclude3(self):
-    mock_input_api = MockInputApi()
-    contents = ['#include "some/path/foo.h"',
-                '#include "a/header.h"']
-    mock_file = MockFile('some/path/foo_platform.cc', contents)
-    warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(0, len(warnings))
-
-  def testSpecialFirstInclude4(self):
-    mock_input_api = MockInputApi()
-    contents = ['#include "some/path/bar.h"',
-                '#include "a/header.h"']
-    mock_file = MockFile('some/path/foo_platform.cc', contents)
-    warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(1, len(warnings))
-    self.assertTrue('2' in warnings[0])
-
-  def testSpecialFirstInclude5(self):
-    mock_input_api = MockInputApi()
-    contents = ['#include "some/other/path/foo.h"',
-                '#include "a/header.h"']
-    mock_file = MockFile('some/path/foo-suffix.h', contents)
-    warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(0, len(warnings))
-
-  def testSpecialFirstInclude6(self):
-    mock_input_api = MockInputApi()
-    contents = ['#include "some/other/path/foo_win.h"',
-                '#include <set>',
-                '#include "a/header.h"']
-    mock_file = MockFile('some/path/foo_unittest_win.h', contents)
-    warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(0, len(warnings))
-
-  def testOrderAlreadyWrong(self):
-    scope = [(1, '#include "b.h"'),
-             (2, '#include "a.h"'),
-             (3, '#include "c.h"')]
-    mock_input_api = MockInputApi()
-    warnings = PRESUBMIT._CheckIncludeOrderForScope(scope, mock_input_api,
-                                                    '', [3])
-    self.assertEqual(0, len(warnings))
-
-  def testConflictAdded1(self):
-    scope = [(1, '#include "a.h"'),
-             (2, '#include "c.h"'),
-             (3, '#include "b.h"')]
-    mock_input_api = MockInputApi()
-    warnings = PRESUBMIT._CheckIncludeOrderForScope(scope, mock_input_api,
-                                                    '', [2])
-    self.assertEqual(1, len(warnings))
-    self.assertTrue('3' in warnings[0])
-
-  def testConflictAdded2(self):
-    scope = [(1, '#include "c.h"'),
-             (2, '#include "b.h"'),
-             (3, '#include "d.h"')]
-    mock_input_api = MockInputApi()
-    warnings = PRESUBMIT._CheckIncludeOrderForScope(scope, mock_input_api,
-                                                    '', [2])
-    self.assertEqual(1, len(warnings))
-    self.assertTrue('2' in warnings[0])
-
-  def testIfElifElseEndif(self):
-    mock_input_api = MockInputApi()
-    contents = ['#include "e.h"',
-                '#define foo',
-                '#include "f.h"',
-                '#undef foo',
-                '#include "e.h"',
-                '#if foo',
-                '#include "d.h"',
-                '#elif bar',
-                '#include "c.h"',
-                '#else',
-                '#include "b.h"',
-                '#endif',
-                '#include "a.h"']
-    mock_file = MockFile('', contents)
-    warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(0, len(warnings))
-
-  def testExcludedIncludes(self):
-    # #include <sys/...>'s can appear in any order.
-    mock_input_api = MockInputApi()
-    contents = ['#include <sys/b.h>',
-                '#include <sys/a.h>']
-    mock_file = MockFile('', contents)
-    warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(0, len(warnings))
-
-    contents = ['#include <atlbase.h>',
-                '#include <aaa.h>']
-    mock_file = MockFile('', contents)
-    warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(0, len(warnings))
-
-    contents = ['#include "build/build_config.h"',
-                '#include "aaa.h"']
-    mock_file = MockFile('', contents)
-    warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(0, len(warnings))
-
-  def testCheckOnlyCFiles(self):
-    mock_input_api = MockInputApi()
-    mock_output_api = MockOutputApi()
-    contents = ['#include <b.h>',
-                '#include <a.h>']
-    mock_file_cc = MockFile('something.cc', contents)
-    mock_file_h = MockFile('something.h', contents)
-    mock_file_other = MockFile('something.py', contents)
-    mock_input_api.files = [mock_file_cc, mock_file_h, mock_file_other]
-    warnings = PRESUBMIT._CheckIncludeOrder(mock_input_api, mock_output_api)
-    self.assertEqual(1, len(warnings))
-    self.assertEqual(2, len(warnings[0].items))
-    self.assertEqual('promptOrNotify', warnings[0].type)
-
-  def testUncheckableIncludes(self):
-    mock_input_api = MockInputApi()
-    contents = ['#include <windows.h>',
-                '#include "b.h"',
-                '#include "a.h"']
-    mock_file = MockFile('', contents)
-    warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(1, len(warnings))
-
-    contents = ['#include "gpu/command_buffer/gles_autogen.h"',
-                '#include "b.h"',
-                '#include "a.h"']
-    mock_file = MockFile('', contents)
-    warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(1, len(warnings))
-
-    contents = ['#include "gl_mock_autogen.h"',
-                '#include "b.h"',
-                '#include "a.h"']
-    mock_file = MockFile('', contents)
-    warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(1, len(warnings))
-
-    contents = ['#include "ipc/some_macros.h"',
-                '#include "b.h"',
-                '#include "a.h"']
-    mock_file = MockFile('', contents)
-    warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(1, len(warnings))
-
-
-class VersionControlConflictsTest(unittest.TestCase):
-  def testTypicalConflict(self):
-    lines = ['<<<<<<< HEAD',
-             '  base::ScopedTempDir temp_dir_;',
-             '=======',
-             '  ScopedTempDir temp_dir_;',
-             '>>>>>>> master']
-    errors = PRESUBMIT._CheckForVersionControlConflictsInFile(
-        MockInputApi(), MockFile('some/path/foo_platform.cc', lines))
-    self.assertEqual(3, len(errors))
-    self.assertTrue('1' in errors[0])
-    self.assertTrue('3' in errors[1])
-    self.assertTrue('5' in errors[2])
-
-
-class BadExtensionsTest(unittest.TestCase):
-  def testBadRejFile(self):
-    mock_input_api = MockInputApi()
-    mock_input_api.files = [
-      MockFile('some/path/foo.cc', ''),
-      MockFile('some/path/foo.cc.rej', ''),
-      MockFile('some/path2/bar.h.rej', ''),
-    ]
-
-    results = PRESUBMIT._CheckPatchFiles(mock_input_api, MockOutputApi())
-    self.assertEqual(1, len(results))
-    self.assertEqual(2, len(results[0].items))
-    self.assertTrue('foo.cc.rej' in results[0].items[0])
-    self.assertTrue('bar.h.rej' in results[0].items[1])
-
-  def testBadOrigFile(self):
-    mock_input_api = MockInputApi()
-    mock_input_api.files = [
-      MockFile('other/path/qux.h.orig', ''),
-      MockFile('other/path/qux.h', ''),
-      MockFile('other/path/qux.cc', ''),
-    ]
-
-    results = PRESUBMIT._CheckPatchFiles(mock_input_api, MockOutputApi())
-    self.assertEqual(1, len(results))
-    self.assertEqual(1, len(results[0].items))
-    self.assertTrue('qux.h.orig' in results[0].items[0])
-
-  def testGoodFiles(self):
-    mock_input_api = MockInputApi()
-    mock_input_api.files = [
-      MockFile('other/path/qux.h', ''),
-      MockFile('other/path/qux.cc', ''),
-    ]
-    results = PRESUBMIT._CheckPatchFiles(mock_input_api, MockOutputApi())
-    self.assertEqual(0, len(results))
-
-  def testOnlyOwnersFiles(self):
-    mock_change = MockChange([
-      'some/path/OWNERS',
-      'A\Windows\Path\OWNERS',
-    ])
-    results = PRESUBMIT.GetPreferredTryMasters(None, mock_change)
-    self.assertEqual({}, results)
-
-
-class InvalidOSMacroNamesTest(unittest.TestCase):
-  def testInvalidOSMacroNames(self):
-    lines = ['#if defined(OS_WINDOWS)',
-             ' #elif defined(OS_WINDOW)',
-             ' # if defined(OS_MACOSX) || defined(OS_CHROME)',
-             '# else  // defined(OS_MAC)',
-             '#endif  // defined(OS_MACOS)']
-    errors = PRESUBMIT._CheckForInvalidOSMacrosInFile(
-        MockInputApi(), MockFile('some/path/foo_platform.cc', lines))
-    self.assertEqual(len(lines), len(errors))
-    self.assertTrue(':1 OS_WINDOWS' in errors[0])
-    self.assertTrue('(did you mean OS_WIN?)' in errors[0])
-
-  def testValidOSMacroNames(self):
-    lines = ['#if defined(%s)' % m for m in PRESUBMIT._VALID_OS_MACROS]
-    errors = PRESUBMIT._CheckForInvalidOSMacrosInFile(
-        MockInputApi(), MockFile('some/path/foo_platform.cc', lines))
-    self.assertEqual(0, len(errors))
-
-
-class CheckAddedDepsHaveTetsApprovalsTest(unittest.TestCase):
-  def testFilesToCheckForIncomingDeps(self):
-    changed_lines = [
-      '"+breakpad",',
-      '"+chrome/installer",',
-      '"+chrome/plugin/chrome_content_plugin_client.h",',
-      '"+chrome/utility/chrome_content_utility_client.h",',
-      '"+chromeos/chromeos_paths.h",',
-      '"+components/crash",',
-      '"+components/nacl/common",',
-      '"+content/public/browser/render_process_host.h",',
-      '"+jni/fooblat.h",',
-      '"+grit",  # For generated headers',
-      '"+grit/generated_resources.h",',
-      '"+grit/",',
-      '"+policy",  # For generated headers and source',
-      '"+sandbox",',
-      '"+tools/memory_watcher",',
-      '"+third_party/lss/linux_syscall_support.h",',
-    ]
-    files_to_check = PRESUBMIT._FilesToCheckForIncomingDeps(re, changed_lines)
-    expected = set([
-      'breakpad/DEPS',
-      'chrome/installer/DEPS',
-      'chrome/plugin/chrome_content_plugin_client.h',
-      'chrome/utility/chrome_content_utility_client.h',
-      'chromeos/chromeos_paths.h',
-      'components/crash/DEPS',
-      'components/nacl/common/DEPS',
-      'content/public/browser/render_process_host.h',
-      'policy/DEPS',
-      'sandbox/DEPS',
-      'tools/memory_watcher/DEPS',
-      'third_party/lss/linux_syscall_support.h',
-    ])
-    self.assertEqual(expected, files_to_check);
-
-
-class JSONParsingTest(unittest.TestCase):
-  def testSuccess(self):
-    input_api = MockInputApi()
-    filename = 'valid_json.json'
-    contents = ['// This is a comment.',
-                '{',
-                '  "key1": ["value1", "value2"],',
-                '  "key2": 3  // This is an inline comment.',
-                '}'
-                ]
-    input_api.files = [MockFile(filename, contents)]
-    self.assertEqual(None,
-                     PRESUBMIT._GetJSONParseError(input_api, filename))
-
-  def testFailure(self):
-    input_api = MockInputApi()
-    test_data = [
-      ('invalid_json_1.json',
-       ['{ x }'],
-       'Expecting property name:'),
-      ('invalid_json_2.json',
-       ['// Hello world!',
-        '{ "hello": "world }'],
-       'Unterminated string starting at:'),
-      ('invalid_json_3.json',
-       ['{ "a": "b", "c": "d", }'],
-       'Expecting property name:'),
-      ('invalid_json_4.json',
-       ['{ "a": "b" "c": "d" }'],
-       'Expecting , delimiter:'),
-      ]
-
-    input_api.files = [MockFile(filename, contents)
-                       for (filename, contents, _) in test_data]
-
-    for (filename, _, expected_error) in test_data:
-      actual_error = PRESUBMIT._GetJSONParseError(input_api, filename)
-      self.assertTrue(expected_error in str(actual_error),
-                      "'%s' not found in '%s'" % (expected_error, actual_error))
-
-  def testNoEatComments(self):
-    input_api = MockInputApi()
-    file_with_comments = 'file_with_comments.json'
-    contents_with_comments = ['// This is a comment.',
-                              '{',
-                              '  "key1": ["value1", "value2"],',
-                              '  "key2": 3  // This is an inline comment.',
-                              '}'
-                              ]
-    file_without_comments = 'file_without_comments.json'
-    contents_without_comments = ['{',
-                                 '  "key1": ["value1", "value2"],',
-                                 '  "key2": 3',
-                                 '}'
-                                 ]
-    input_api.files = [MockFile(file_with_comments, contents_with_comments),
-                       MockFile(file_without_comments,
-                                contents_without_comments)]
-
-    self.assertEqual('No JSON object could be decoded',
-                     str(PRESUBMIT._GetJSONParseError(input_api,
-                                                      file_with_comments,
-                                                      eat_comments=False)))
-    self.assertEqual(None,
-                     PRESUBMIT._GetJSONParseError(input_api,
-                                                  file_without_comments,
-                                                  eat_comments=False))
-
-
-class IDLParsingTest(unittest.TestCase):
-  def testSuccess(self):
-    input_api = MockInputApi()
-    filename = 'valid_idl_basics.idl'
-    contents = ['// Tests a valid IDL file.',
-                'namespace idl_basics {',
-                '  enum EnumType {',
-                '    name1,',
-                '    name2',
-                '  };',
-                '',
-                '  dictionary MyType1 {',
-                '    DOMString a;',
-                '  };',
-                '',
-                '  callback Callback1 = void();',
-                '  callback Callback2 = void(long x);',
-                '  callback Callback3 = void(MyType1 arg);',
-                '  callback Callback4 = void(EnumType type);',
-                '',
-                '  interface Functions {',
-                '    static void function1();',
-                '    static void function2(long x);',
-                '    static void function3(MyType1 arg);',
-                '    static void function4(Callback1 cb);',
-                '    static void function5(Callback2 cb);',
-                '    static void function6(Callback3 cb);',
-                '    static void function7(Callback4 cb);',
-                '  };',
-                '',
-                '  interface Events {',
-                '    static void onFoo1();',
-                '    static void onFoo2(long x);',
-                '    static void onFoo2(MyType1 arg);',
-                '    static void onFoo3(EnumType type);',
-                '  };',
-                '};'
-                ]
-    input_api.files = [MockFile(filename, contents)]
-    self.assertEqual(None,
-                     PRESUBMIT._GetIDLParseError(input_api, filename))
-
-  def testFailure(self):
-    input_api = MockInputApi()
-    test_data = [
-      ('invalid_idl_1.idl',
-       ['//',
-        'namespace test {',
-        '  dictionary {',
-        '    DOMString s;',
-        '  };',
-        '};'],
-       'Unexpected "{" after keyword "dictionary".\n'),
-      # TODO(yoz): Disabled because it causes the IDL parser to hang.
-      # See crbug.com/363830.
-      # ('invalid_idl_2.idl',
-      #  (['namespace test {',
-      #    '  dictionary MissingSemicolon {',
-      #    '    DOMString a',
-      #    '    DOMString b;',
-      #    '  };',
-      #    '};'],
-      #   'Unexpected symbol DOMString after symbol a.'),
-      ('invalid_idl_3.idl',
-       ['//',
-        'namespace test {',
-        '  enum MissingComma {',
-        '    name1',
-        '    name2',
-        '  };',
-        '};'],
-       'Unexpected symbol name2 after symbol name1.'),
-      ('invalid_idl_4.idl',
-       ['//',
-        'namespace test {',
-        '  enum TrailingComma {',
-        '    name1,',
-        '    name2,',
-        '  };',
-        '};'],
-       'Trailing comma in block.'),
-      ('invalid_idl_5.idl',
-       ['//',
-        'namespace test {',
-        '  callback Callback1 = void(;',
-        '};'],
-       'Unexpected ";" after "(".'),
-      ('invalid_idl_6.idl',
-       ['//',
-        'namespace test {',
-        '  callback Callback1 = void(long );',
-        '};'],
-       'Unexpected ")" after symbol long.'),
-      ('invalid_idl_7.idl',
-       ['//',
-        'namespace test {',
-        '  interace Events {',
-        '    static void onFoo1();',
-        '  };',
-        '};'],
-       'Unexpected symbol Events after symbol interace.'),
-      ('invalid_idl_8.idl',
-       ['//',
-        'namespace test {',
-        '  interface NotEvent {',
-        '    static void onFoo1();',
-        '  };',
-        '};'],
-       'Did not process Interface Interface(NotEvent)'),
-      ('invalid_idl_9.idl',
-       ['//',
-        'namespace test {',
-        '  interface {',
-        '    static void function1();',
-        '  };',
-        '};'],
-       'Interface missing name.'),
-      ]
-
-    input_api.files = [MockFile(filename, contents)
-                       for (filename, contents, _) in test_data]
-
-    for (filename, _, expected_error) in test_data:
-      actual_error = PRESUBMIT._GetIDLParseError(input_api, filename)
-      self.assertTrue(expected_error in str(actual_error),
-                      "'%s' not found in '%s'" % (expected_error, actual_error))
-
-
-class TryServerMasterTest(unittest.TestCase):
-  def testTryServerMasters(self):
-    bots = {
-        'tryserver.chromium.gpu': [
-            'mac_gpu',
-            'mac_gpu_triggered_tests',
-            'linux_gpu',
-            'linux_gpu_triggered_tests',
-            'win_gpu',
-            'win_gpu_triggered_tests',
-        ],
-        'tryserver.chromium.mac': [
-            'ios_dbg_simulator',
-            'ios_rel_device',
-            'ios_rel_device_ninja',
-            'mac_asan',
-            'mac_asan_64',
-            'mac_chromium_compile_dbg',
-            'mac_chromium_compile_rel',
-            'mac_chromium_dbg',
-            'mac_chromium_rel',
-            'mac_chromium_rel_swarming',
-            'mac_nacl_sdk',
-            'mac_nacl_sdk_build',
-            'mac_rel_naclmore',
-            'mac_valgrind',
-            'mac_x64_rel',
-            'mac_xcodebuild',
-        ],
-        'tryserver.chromium.linux': [
-            'android_aosp',
-            'android_chromium_gn_compile_dbg',
-            'android_chromium_gn_compile_rel',
-            'android_clang_dbg',
-            'android_dbg',
-            'android_dbg_recipe',
-            'android_dbg_triggered_tests',
-            'android_dbg_triggered_tests_recipe',
-            'android_fyi_dbg',
-            'android_fyi_dbg_triggered_tests',
-            'android_rel',
-            'android_rel_triggered_tests',
-            'android_x86_dbg',
-            'blink_android_compile_dbg',
-            'blink_android_compile_rel',
-            'blink_presubmit',
-            'chromium_presubmit',
-            'linux_arm_cross_compile',
-            'linux_arm_tester',
-            'linux_asan',
-            'linux_browser_asan',
-            'linux_chromeos_asan',
-            'linux_chromeos_browser_asan',
-            'linux_chromeos_valgrind',
-            'linux_chromium_chromeos_clang_dbg',
-            'linux_chromium_chromeos_clang_rel',
-            'linux_chromium_chromeos_dbg',
-            'linux_chromium_chromeos_rel',
-            'linux_chromium_clang_dbg',
-            'linux_chromium_clang_rel',
-            'linux_chromium_compile_dbg',
-            'linux_chromium_compile_rel',
-            'linux_chromium_dbg',
-            'linux_chromium_gn_dbg',
-            'linux_chromium_gn_rel',
-            'linux_chromium_rel',
-            'linux_chromium_rel_swarming',
-            'linux_chromium_trusty32_dbg',
-            'linux_chromium_trusty32_rel',
-            'linux_chromium_trusty_dbg',
-            'linux_chromium_trusty_rel',
-            'linux_clang_tsan',
-            'linux_ecs_ozone',
-            'linux_layout',
-            'linux_layout_asan',
-            'linux_layout_rel',
-            'linux_layout_rel_32',
-            'linux_nacl_sdk',
-            'linux_nacl_sdk_bionic',
-            'linux_nacl_sdk_bionic_build',
-            'linux_nacl_sdk_build',
-            'linux_redux',
-            'linux_rel_naclmore',
-            'linux_rel_precise32',
-            'linux_valgrind',
-            'tools_build_presubmit',
-        ],
-        'tryserver.chromium.win': [
-            'win8_aura',
-            'win8_chromium_dbg',
-            'win8_chromium_rel',
-            'win_chromium_compile_dbg',
-            'win_chromium_compile_rel',
-            'win_chromium_dbg',
-            'win_chromium_rel',
-            'win_chromium_rel',
-            'win_chromium_rel_swarming',
-            'win_chromium_rel_swarming',
-            'win_chromium_x64_dbg',
-            'win_chromium_x64_rel',
-            'win_drmemory',
-            'win_nacl_sdk',
-            'win_nacl_sdk_build',
-            'win_rel_naclmore',
-         ],
-    }
-    for master, bots in bots.iteritems():
-      for bot in bots:
-        self.assertEqual(master, PRESUBMIT.GetTryServerMasterForBot(bot),
-                         'bot=%s: expected %s, computed %s' % (
-            bot, master, PRESUBMIT.GetTryServerMasterForBot(bot)))
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/WATCHLISTS b/WATCHLISTS
deleted file mode 100644
index 45a3a1d..0000000
--- a/WATCHLISTS
+++ /dev/null
@@ -1,1005 +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.
-
-# Watchlist Rules
-# Refer: http://dev.chromium.org/developers/contributing-code/watchlists
-
-# IMPORTANT: The regular expression filepath is tested against each path using
-# re.search, so it is not usually necessary to add .*.
-
-{
-  'WATCHLIST_DEFINITIONS': {
-    'accelerator_table': {
-      'filepath': 'ash/accelerators/accelerator_table\.cc' \
-                  '|chrome/browser/ui/views/accelerator_table\.cc',
-    },
-    'accessibility': {
-      'filepath': 'braille' \
-                  '|chrome/browser/accessibility/' \
-                  '|chromevox' \
-                  '|content/browser/accessibility/' \
-                  '|content/browser/resources/accessibility/' \
-                  '|content/renderer/accessibility/' \
-                  '|content/test/data/accessibility/' \
-                  '|content/public/android/.*accessib' \
-                  '|chrome/.*accessib' \
-                  '|liblouis' \
-                  '|ui/base/accessibility/' \
-                  '|ui/views/accessibility/'
-    },
-    'activity_log': {
-      'filepath': 'chrome/browser/extensions/activity_log/' \
-                  '|chrome/browser/extensions/api/activity_log_private/'
-    },
-    'android_infra': {
-      'filepath': 'build/android/' \
-                  '|testing/android/' \
-                  '|tools/android/'
-    },
-    'android_media': {
-      'filepath': 'content/browser/media/android' \
-                  '|content/renderer/media/android' \
-                  '|media/audio/android' \
-                  '|media/base/android' \
-                  '|media/midi/*_android.*' \
-                  '|media/video/capture/android'
-    },
-    'android_tab': {
-      'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/Tab'
-    },
-    'android_webview': {
-      'filepath': 'android_webview/',
-    },
-    'app_list': {
-      'filepath': 'chrome/browser/ui/app_list'\
-                  '|chrome/browser/ui/ash/app_list'\
-                  '|chrome/browser/ui/views/app_list'\
-                  '|ui/app_list/'
-    },
-    'app_shortcuts': {
-      'filepath': 'apps/app_shim/'\
-                  '|chrome/browser/web_applications/'\
-                  '|chrome/browser/ui/web_applications/'\
-                  '|chrome/common/mac/'
-    },
-    'appcache': {
-      'filepath': 'appcache/',
-    },
-    'apps': {
-      'filepath': '^apps/',
-    },
-    'ash': {
-      'filepath': 'ash/',
-    },
-    'aura': {
-      'filepath': 'ui/aura/',
-    },
-    'aura_compositor': {
-      'filepath':
-        'ui/compositor/' \
-        '|content/browser/compositor/' \
-        '|content/browser/renderer_host/compositor_resize_lock_aura' \
-        '|content/browser/renderer_host/render_widget_host_view_aura' \
-        '|content/browser/renderer_host/render_widget_host_view_browsertest' \
-        '|content/browser/renderer_host/delegated' \
-        '|content/browser/renderer_host/software' \
-        '|content/common/gpu/client/' \
-        '|webkit/common/gpu/'
-    },
-    'autofill': {
-      'filepath': 'chrome/browser/autofill/|'\
-                  'chrome/browser/resources/options/autofill_|'\
-                  'chrome/browser/sync/glue/autofill_|'\
-                  'chrome/browser/ui/android/autofill/|'\
-                  'chrome/browser/ui/autofill/|'\
-                  'chrome/browser/ui/cocoa/autofill/|'\
-                  'chrome/browser/ui/gtk/autofill/|'\
-                  'chrome/browser/ui/views/autofill/|'\
-                  'chrome/browser/ui/webui/options/autofill_|'\
-                  'chrome/renderer/autofill/|'\
-                  'chrome/test/data/autofill/|'\
-                  'components/autofill/|'\
-                  'components/autofill/browser/webdata/|'\
-                  'components/webdata/|'\
-                  'content/public/common/password_|'\
-                  'content/public/renderer/password_|'\
-                  'content/renderer/password_',
-    },
-    'automation': {
-      'filepath': 'chrome/browser/automation/|chrome/test/automation/',
-    },
-    'base': {
-      'filepath': '^base/',
-    },
-    'base_allocator': {
-      'filepath': '^base/allocator',
-    },
-    'base_memory': {
-      'filepath': '^base/memory',
-    },
-    'base_win': {
-      'filepath': '^base/win',
-    },
-    'battery_status': {
-      'filepath': 'content/browser/battery_status/|'\
-                  'content/common/battery_status_messages.h|'\
-                  'content/public/android/java/src/org/chromium/content/browser/BatteryStatusManager.java|'\
-                  'content/public/android/javatests/src/org/chromium/content/browser/BatteryStatusManagerTest.java|'\
-                  'content/renderer/battery_status/',
-    },
-    'bookmarks': {
-      'filepath': 'chrome/browser/bookmarks/' \
-                  '|chrome/browser/extensions/api/bookmark_manager_private/' \
-                  '|chrome/browser/extensions/api/bookmarks/' \
-                  '|chrome/browser/resources/bookmark_manager/' \
-                  '|chrome/browser/ui/bookmarks/' \
-                  '|chrome/browser/ui/cocoa/bookmarks/' \
-                  '|chrome/browser/ui/views/bookmarks/' \
-                  '|components/bookmarks'
-    },
-    'breakpad_app': {
-      'filepath': 'components/crash/app/',
-    },
-    'browser': {
-      'filepath': 'chrome/browser/',
-    },
-    'browser_chromeos': {
-      'filepath': 'chrome/browser/chromeos/',
-    },
-    'browser_components': {
-      'filepath': 'chrome/browser/autofill/' \
-                  '|chrome/browser/bookmarks/' \
-                  '|chrome/browser/favicon/' \
-                  '|chrome/browser/history/' \
-                  '|chrome/browser/webdata/' \
-                  '|components/autofill/'
-    },
-    'browser_compositor': {
-      'filepath': 'ui/compositor/'
-    },
-    'browser_resources': {
-      'filepath': 'chrome/browser/resources/',
-    },
-    'browsing_data': {
-      'filepath': 'chrome/browser/browsing_data/',
-    },
-    'bubble': {
-      'filepath': 'ui/views/bubble/|'\
-                  'chrome/browser/ui/views/bubble/',
-    },
-    'cast': {
-      'filepath': 'media/cast/'\
-                  '|chrome/browser/extensions/api/cast_streaming/'\
-                  '|chrome/browser/media/cast'\
-                  '|chrome/renderer/media/cast'\
-                  '|chrome/test/data/extensions/api_test/cast_'\
-                  '|content/public/renderer/media_stream_',
-    },
-    'chromecast': {
-      'filepath': 'chromecast/',
-    },
-    'cc': {
-      'filepath': 'cc/|'\
-                  'webkit/renderer/compositor_bindings/|'\
-                  'content/common/cc_messages'
-    },
-    'chrome_elf': {
-      'filepath': 'chrome_elf',
-    },
-    'chrome_views': {
-      'filepath': 'chrome/browser/ui/views',
-    },
-    'chromedriver': {
-      'filepath': 'chrome/test/chromedriver'
-    },
-    'chromeos': {
-      'filepath': 'chromeos/',
-    },
-    'chromeos_attestation': {
-      'filepath': 'chromeos/attestation/|'\
-                  'chrome/browser/chromeos/attestation/|'\
-                  'chrome/browser/extensions/api/enterprise_platform_keys_private/',
-    },
-    'chromeos_calculator': {
-      'filepath': 'chrome/common/extensions/docs/examples/apps/calculator/',
-    },
-    'chromeos_dbus': {
-      'filepath': 'chromeos/dbus/',
-    },
-    'chromeos_login': {
-      'filepath': 'chrome/browser/chromeos/login/|'\
-                  'chrome/browser/ui/webui/chromeos/login/|'\
-                  'chrome/browser/resources/chromeos/login/',
-    },
-    'chromeos_net': {
-      'filepath': 'chromeos/network/|'\
-                  'chrome/browser/chromeos/cros/|'\
-                  'chrome/browser/chromeos/net/',
-    },
-    'chromeos_power': {
-      'filepath': 'ash/system/chromeos/power/|'\
-                  'chromeos/dbus/power_.*|'\
-                  'chrome/browser/chromeos/power/',
-    },
-    'chromeos_webui': {
-      'filepath': 'chrome/browser/ui/webui/chromeos/|'\
-                  'chrome/browser/resources/chromeos/',
-    },
-    'clang_update': {
-      'filepath': 'tools/clang/scripts/update.sh'
-    },
-    'clipboard': {
-      'filepath': 'clipboard|dnd|drag|drop',
-    },
-    'closure': {
-      'filepath': 'third_party/closure_(compiler|linter)/|'
-                  'compiled_resources.gyp',
-    },
-    'content': {
-      'filepath': 'content/',
-    },
-    'content_input': {
-      'filepath': 'content/browser/renderer_host/input/|'\
-                  'content/common/input/|'\
-                  'content/renderer/input/',
-    },
-    'content_shell': {
-      'filepath': 'content/shell/',
-    },
-    'cookie_monster': {
-      'filepath': 'net/cookies/|'\
-                  'chrome/browser/net/sqlite_persistent_cookie_store',
-    },
-    'deep_memory_profiler': {
-      'filepath': 'tools/(deep_memory_profiler|find_runtime_symbols)',
-    },
-    'device_sensors': {
-      'filepath': 'content/browser/device_sensors/|'\
-                  'content/common/device_sensors/|'\
-                  'content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java|'\
-                  'content/public/android/javatests/src/org/chromium/content/browser/DeviceSensorsTest.java|'\
-                  'content/renderer/device_sensors/',
-    },
-    'devtools': {
-      'filepath': 'devtools',
-    },
-    'disk_cache': {
-      'filepath': 'net/disk_cache/|http_cache',
-    },
-    'dns': {
-      'filepath': 'net/base/host_resolver|' \
-                  'net/base/host_cache|' \
-                  'net/dns/'
-    },
-    'domui_options': {
-      'filepath': 'chrome/browser/resources/options/|'\
-                  'chrome/browser/resources/options.html|'\
-                  'chrome/browser/ui/webui/options/',
-    },
-    'download': {
-      'filepath': 'chrome/browser/download/|'\
-                  'content/browser/download/',
-    },
-    'download_database': {
-      'filepath': 'chrome/browser/history/download_database',
-    },
-    'downloads_ext': {
-      'filepath': 'chrome/browser/extensions/api/downloads/|'\
-                  'chrome/common/extensions/api/downloads.*.idl',
-    },
-    'downloads_ui': {
-      'filepath': 'chrome/browser/resources/downloads/|' \
-                  'chrome/browser/ui/webui/.*downloads|' \
-                  'chrome/browser/ui/views/download/|' \
-                  'chrome/browser/ui/cocoa/download/|' \
-                  'chrome/browser/ui/gtk/download/'
-    },
-    'drive': {
-      'filepath': 'chrome/browser/chromeos/drive/|' \
-                  'chrome/browser/google_apis/'
-    },
-    'drive_resource_metadata': {
-      'filepath': 'chrome/browser/chromeos/drive/resource_metadata'
-    },
-    'eme': {
-      'filepath': 'components/cdm/|' \
-                  'content/browser/media/cdm/|' \
-                  'content/renderer/media/crypto/|' \
-                  'media/base/android/*drm*|' \
-                  'media/cdm/|' \
-                  'third_party/widevine/cdm/'
-    },
-    'events': {
-      'filepath': 'ui/events/',
-    },
-    'extension': {
-      'filepath': 'extension',
-    },
-    'fileapi': {
-      'filepath': 'file_system/|' \
-                  'fileapi/'
-    },
-    'filebrowse': {
-      'filepath': 'file_browser|' \
-                  'file_manager|' \
-                  'filebrowse'
-    },
-    'filesapp': {
-      'filepath': 'ui/file_manager'
-    },
-    'ftp': {
-      'filepath': 'ftp',
-    },
-    'gcm': {
-      'filepath': 'chrome/browser/services/gcm/|'\
-                  'components/gcm_driver/|'\
-                  'google_apis/gcm/',
-    },
-    'geolocation': {
-      'filepath': 'chrome/browser/geolocation/|'\
-                  'content/browser/geolocation|'\
-                  'content/public/common/geoposition.*|'\
-                  'content/public/browser/geolocation.*|'\
-                  'content/renderer/geolocation.*|'\
-                  'content/shell/geolocation/',
-    },
-    'gfx_image': {
-      'filepath': 'ui/gfx/image/',
-    },
-    'gfx_geometry': {
-      'filepath': 'ui/gfx/rect|'\
-                  'ui/gfx/quad|'\
-                  'ui/gfx/point|'\
-                  'ui/gfx/size|'\
-                  'ui/gfx/transform|'\
-                  'ui/gfx/vector2d',
-    },
-    'gn': {
-      'filepath': 'tools/gn',
-    },
-    'gpu': {
-      'filepath': 'gpu/',
-    },
-    'history_ui': {
-      'filepath': 'chrome/browser/resources/history',
-    },
-    'hotword': {
-      'filepath': 'chrome/browser/extensions/api/hotword_private/'\
-                  '|chrome/browser/resources/hotword_helper/'\
-                  '|chrome/browser/resources/hotword/'\
-                  '|chrome/browser/search/hotword*'\
-                  '|chrome/test/data/extensions/api_test/hotword_private/',
-    },
-    'i18n': {
-      'filepath': 'base/i18n/|base/string|l10n|icu|'\
-        'locale_settings|encoding',
-    },
-    'imageburner': {
-      'filepath': 'imageburner'
-    },
-    'importer': {
-      'filepath': 'import',
-    },
-    'indexed_db': {
-      'filepath': 'content/browser/indexed_db|'\
-                  'content/child/indexed_db|'\
-                  'content/common/indexed_db|'\
-                  'content/public/browser/indexed_db|'\
-                  'content/test/data/indexeddb',
-    },
-    'installer': {
-      'filepath': 'chrome/installer/',
-    },
-    'instant': {
-      'filepath': 'instant|searchbox|'\
-                  'chrome/browser/search/|'\
-                  'chrome/browser/ui/search/|'\
-                  'chrome/browser/resources/local_ntp/|'\
-                  'chrome/common/search_types.*',
-    },
-    'ipc': {
-      'filepath': 'ipc/ipc',
-    },
-    'libwebp': {
-      'filepath': 'third_party/libwebp'
-    },
-    'layout_tests': {
-      'filepath': 'webkit/(tools|data)/(layout_tests|test_shell)/',
-    },
-    'linux_fonts': {
-      'filepath': 'ui/gfx/font_render_params_.*|'\
-                  'ui/gfx/platform_font_pango.*|'\
-                  'ui/gfx/render_text_linux.*',
-    },
-    'linux_sandboxing': {
-      'filepath': 'sandbox/linux/',
-    },
-    'linux_seccomp_bpf': {
-      'filepath': 'content/common/sandbox.*linux.cc',
-    },
-    'media': {
-      'filepath': 'media/|third_party/(ffmpeg|openmax)/|webmediaplayer|'\
-        'audio_message_filter|video_layer|media_internals',
-    },
-    'media_galleries': {
-      'filepath': 'chrome/browser/extensions/api/media_galleries/'\
-                  '|chrome/browser/extensions/api/media_galleries_private/'\
-                  '|chrome/browser/media_galleries/'\
-                  '|chrome/browser/storage_monitor/'\
-                  '|chrome/common/media_galleries/'\
-                  '|chrome/test/data/extensions/api_test/media_galleries/'\
-                  '|chrome/utility/itunes*'\
-                  '|chrome/utility/picasa*',
-    },
-    'message_loop': {
-      'filepath': 'base/message_'
-    },
-    'metrics': {
-      'filepath': 'base/metrics/'\
-                  '|chrome/browser/metrics/'\
-                  '|chrome/common/metrics/'\
-                  '|chrome/browser/chromeos/external_metrics'\
-                  '|chrome/browser/extensions/api/metrics_private/'\
-                  '|chrome/browser/ui/webui/metrics_handler'\
-                  '|content/browser/user_metrics.cc'\
-                  '|components/rappor/'\
-                  '|content/public/browser/user_metrics.h'\
-                  # Exclude XML files; in particular, histograms.xml.
-                  '|tools/metrics/[^.]*([.](?!xml$).*)?$',
-    },
-    'metrics_xml_files': {
-      # Subscribe to this to watch for changes to histograms.xml.
-      'filepath': 'tools/metrics/.*\.xml$'
-    },
-    'mojo': {
-      'filepath': 'mojo',
-    },
-    'mouse_lock': {
-      'filepath': 'mouse_lock',
-    },
-    'music_manager_private': {
-      'filepath' :'chrome/browser/extensions/api/music_manager_private/',
-    },
-    'nacl': {
-      'filepath': 'chrome/nacl/|chrome/test/nacl/|'\
-        'chrome/browser/nacl_host/|chrome/common/nacl|'\
-        'native_client_sdk/src/doc/',
-    },
-    'native_client_sdk': {
-      'filepath': '^native_client_sdk/',
-    },
-    'navigation': {
-      'filepath': 'content/browser/frame_host|'\
-                  'content/browser/renderer_host/render_process_host.*|'\
-                  'content/browser/renderer_host/render_view_host.*|'\
-                  'content/browser/web_contents/web_contents_impl.*|'\
-                  'content/renderer/render_frame.*|'\
-                  'content/renderer/render_view.*'
-    },
-    'net': {
-      'filepath': 'net/',
-    },
-    'net_error_list': {
-      'filepath': 'net/base/net_error_list.h',
-    },
-    'net_log': {
-      'filepath': 'net/base/net_log|' \
-        'chrome/browser/net/.*net_log|' \
-        'chrome/browser/net/passive_log_collector|' \
-        'chrome/browser/resources/net_internals/|' \
-        'chrome/browser/ui/webui/net_internals/'
-    },
-    'npapi_headers': {
-      'filepath': 'third_party/npapi/bindings/',
-    },
-    'ntp': {
-      'filepath': 'chrome/browser/resources/ntp4/|'\
-        'chrome/browser/resources/ntp_android/|'\
-        'chrome/browser/ui/webui/ntp/',
-    },
-    'omnibox': {
-      'filepath': 'chrome/browser/autocomplete/'\
-                  '|chrome/browser/ui/.*/omnibox/'
-    },
-    'options': {
-      'filepath': 'chrome/browser/resources/options/|'\
-          'chrome/browser/ui/webui/options/',
-    },
-    'overview_mode': {
-      'filepath': 'ash/wm/overview/',
-    },
-    'ozone': {
-      'filepath': 'ui/ozone/|'\
-        'ui/events/ozone/|'\
-        'ui/gfx/ozone/|'\
-        'ui/gl/gl_.*egl.*|'\
-        'ui/gl/gl_.*ozone.*'
-    },
-    'panels': {
-      'filepath': 'chrome/browser/ui/panels'\
-                  '|chrome/browser/ui/cocoa/panels'\
-                  '|chrome/browser/ui/gtk/panels'\
-                  '|chrome/browser/ui/views/panels'
-    },
-    'password_manager': {
-      'filepath': 'chrome/.*/password_'\
-                  '|chrome/browser/ui/passwords'\
-                  '|chrome/browser/ui/views/passwords'\
-                  '|chrome/test/data/password'\
-                  '|components/autofill.*password'
-                  '|components/password_'\
-    },
-    'pepper_api': {
-      'filepath': 'ppapi/api'\
-                  '|ppapi/c',
-    },
-    'plugin': {
-      'filepath': 'chrome/browser/plugin|chrome/plugin/|'\
-        'chrome/common/plugin|webkit/glue/webplugin|webkit/glue/plugins/',
-    },
-    'policy_templates': {
-      'filepath': 'components/policy/resources/policy_templates.json',
-    },
-    'predictors': {
-      'filepath': 'predictors',
-    },
-    'prepopulated_engines': {
-      'filepath': 'components/search_engines/prepopulated_engines.json',
-    },
-    'prerender': {
-      'filepath': 'prerender'
-    },
-    'pyauto': {
-      'filepath': 'chrome/test/pyautolib' \
-                  '|chrome/test/functional' \
-                  '|chrome/browser/automation/automation_provider_json'
-    },
-    'remoting': {
-      'filepath': 'remoting/',
-    },
-    'search': {
-      'filepath': 'chrome/browser/ui/search/',
-    },
-    'sessions': {
-      'filepath': 'chrome/browser/sessions/',
-    },
-    'service_worker': {
-      'filepath': 'content/(browser|renderer|child|common)/service_worker/',
-    },
-    'site_instance': {
-      'filepath': 'content/browser/site_instance|'\
-        'content/browser/browsing_instance',
-    },
-    'speech': {
-      'filepath': 'chrome/browser/speech/'\
-                  '|content/browser/speech/'\
-                  '|content/common/.*speech'\
-                  '|content/public/.*speech'
-    },
-    'spellcheck': {
-      'filepath': 'chrome/browser/spellchecker/'\
-                   '|chrome/browser/tab_contents/spellchecker'\
-                   '|chrome/browser/tab_contents/spelling_menu'\
-                   '|chrome/common/spellcheck_'\
-                   '|chrome/renderer/spellchecker/'\
-                   '|third_party/hunspell/'\
-                   '|third_party/hunspell_dictionaries/'\
-                   '|webkit/tools/test_shell/mock_spellcheck'
-    },
-    'streams': {
-      'filepath': 'content/browser/streams/',
-    },
-    'supervised_users': {
-      'filepath': 'chrome/browser/.*managed_mode'\
-                  '|chrome/browser/.*managed_user'\
-                  '|chrome/browser/.*supervised_user',
-    },
-    'sync': {
-      'filepath': 'chrome/browser/sync/|sync/|components/sync_driver/',
-    },
-    'syncfs': {
-      'filepath': 'sync_file_system',
-    },
-    'sync_proto': {
-      'filepath': 'sync/protocol/',
-    },
-    'tab_capture': {
-      'filepath': 'cc/output/copy_output_request'\
-        '|chrome/browser/extensions/api/tab_capture/'\
-        '|chrome/test/data/extensions/api_test/tab_capture/'\
-        '|content/browser/compositor/delegated_frame_host'\
-        '|content/browser/media/capture/'\
-        '|content/browser/renderer_host/compositing_iosurface'\
-        '|content/browser/renderer_host/media/(audio_'\
-            '|media_stream_manager|video_)'\
-        '|media/audio/(audio_output_controller|fake_audio_|virtual_audio_)'\
-        '|media/base/video_frame\.h'\
-        '|media/video/capture/video_capture_',
-    },
-    'tab_contents': {
-      'filepath': 'chrome/browser/tab_contents/|'\
-        'content/browser/tab_contents/|'\
-        'chrome/browser/ui/tab_contents/',
-    },
-    'tab_media_indicators': {
-      'filepath': 'chrome/browser/media/audio_stream_monitor'\
-        '|chrome/browser/ui/cocoa/tabs/tab_controller\.mm'\
-        '|chrome/browser/ui/tabs/tab_utils'\
-        '|chrome/browser/ui/views/tabs/tab\.cc'\
-        '|chrome/browser/ui/views/tabs/tab_renderer_data'\
-        '|media/audio/audio_(output_controller|power_monitor)',
-    },
-    'task_manager': {
-      'filepath': 'task_manager'
-    },
-    'tcmalloc': {
-      'filepath': 'third_party/tcmalloc'
-    },
-    'telemetry': {
-      'filepath': 'tools/perf/|'\
-                  'tools/telemetry/'
-    },
-    'tests': {
-      'filepath': 'apitest|unittest|browsertest|uitest|chrome/test/',
-    },
-    'textinput': {
-      'filepath': 'content/browser/renderer_host/gtk_im'\
-                  '|content/browser/renderer_host/gtk_key'\
-                  '|content/browser/renderer_host/render_widget_host_view'\
-                  '|content/browser/renderer_host/text_input'\
-                  '|ui/base/ime/'\
-                  '|ui/base/gtk/event'\
-                  '|ui/base/gtk/gtk_im'\
-                  '|ui/base/keycodes/'\
-                  '|ui/base/win/ime'\
-                  '|ui/views/controls/textfield/'\
-                  '|ui/views/ime/'
-    },
-    'textinput_chromeos': {
-      'filepath': 'chrome/browser/chromeos/input_method/'\
-                  '|chrome/browser/chromeos/extensions/input_method'\
-                  '|chrome/browser/chromeos/status/input_method'\
-                  '|chrome/browser/extensions/extension_input_'\
-                  '|chrome/browser/resources/keyboard'\
-                  '|chrome/browser/resources/options/language'\
-                  '|chrome/browser/ui/webui/options/'\
-                  'chromeos/.*(language|keyboard)'\
-                  '|chrome/browser/ui/webui/options/language'\
-                  '|chromeos/ime/*'
-    },
-    'tools': {
-      'filepath': 'tools/',
-    },
-    'tools_emacs': {
-      'filepath': 'tools/emacs/',
-    },
-    'tracing': {
-      'filepath': 'base/debug/trace_event.*'\
-                  '|content/browser/tracing/'\
-                  '|components/tracing/'
-    },
-    'ui_compositor': {
-      'filepath': 'ui/compositor/layer\.|'\
-                  'ui/compositor/layer_unittest|'\
-                  'ui/compositor/compositor',
-    },
-    'ui_resources': {
-      'filepath': 'ui/resources/'\
-                  '|ui/base/native_theme/resources/'\
-                  '|chrome/app/theme/'
-    },
-    'valgrind': {
-      'filepath': 'valgrind',
-    },
-    'version_assembly': {
-      'filepath': 'chrome/app/version_assembly',
-    },
-    'views': {
-      # Applies to all files and subdirs within this directory.
-      'filepath': '^ui/views/',
-    },
-    'views_core': {
-      'filepath': 'ui/views/view.h|'\
-                  'ui/views/view.cc|'\
-                  'ui/views/widget/',
-    },
-    'views_corewm': {
-      'filepath': 'ui/views/corewm/',
-    },
-    'virtual_keyboard': {
-      'filepath': 'ui/keyboard/'\
-                  'chrome/test/data/chromeos/virtual_keyboard/'\
-                  'chrome/common/extensions/api/virtual_keyboard',
-    },
-    'webkit': {
-      'filepath': 'webkit/',
-    },
-    'webrtc_media': {
-      'filepath': 'chrome/browser/media/|'\
-                  'content/browser/renderer_host/media/|'\
-                  'content/common/gpu/media/|'\
-                  'content/renderer/media/|'\
-                  'media/video/|'\
-                  'video.*_accelerat',
-    },
-    'website_settings': {
-      'filepath': 'chrome/browser/content_settings/'\
-                  '|chrome/browser/ui/views/website_settings/'\
-                  '|chrome/browser/ui/website_settings/'\
-                  '|chrome/common/content_settings'\
-                  '|components/content_settings/',
-    },
-    'windows_sandboxing': {
-      'filepath': 'sandbox/win/',
-    },
-    'worker': {
-      'filepath': 'chrome/browser/worker_host/|chrome/worker/|'\
-        'chrome/common/worker_messages|webkit/glue/webworker',
-    },
-    'x11': {
-      'filepath': 'content/browser/renderer_host/backing_store_x\.' \
-                  '|chrome/browser/chromeos/input_method/xkeyboard\.' \
-                  '|chrome/browser/chromeos/system_key_event_listener\.' \
-                  '|chrome/browser/chromeos/'\
-                  'xinput_hierarchy_changed_event_listener\.' \
-                  '|chrome/browser/chromeos/wm_' \
-                  '|ui/base/x/'
-    },
-  },
-
-  'WATCHLISTS': {
-    'accelerator_table': ['mazda+watch@chromium.org',
-                          'derat+watch@chromium.org',
-                          'yusukes+watch@chromium.org'],
-    'accessibility': ['dmazzoni+watch@chromium.org',
-                      'dtseng+watch@chromium.org',
-                      'plundblad+watch@chromium.org',
-                      'aboxhall+watch@chromium.org',
-                      'yuzo+watch@chromium.org'],
-    'activity_log': ['felt@chromium.org'],
-    'android_infra': ['yfriedman+watch@chromium.org',
-                      'klundberg+watch@chromium.org'],
-    'android_media': ['avayvod+watch@chromium.org'],
-    'android_tab': ['avayvod+watch@chromium.org', 'dtrainor@chromium.org'],
-    'android_webview': ['android-webview-reviews@chromium.org'],
-    'app_list': ['tfarina@chromium.org', 'chrome-apps-syd-reviews@chromium.org'],
-    'app_shortcuts': ['chrome-apps-syd-reviews@chromium.org'],
-    'appcache': ['michaeln@chromium.org'],
-    'apps': ['tfarina@chromium.org', 'chromium-apps-reviews@chromium.org'],
-    'ash': ['ben+ash@chromium.org',
-             'sadrul@chromium.org',
-             'kalyan.kondapally@intel.com'],
-    'aura': ['ben+aura@chromium.org',
-             'sadrul@chromium.org',
-             'kalyan.kondapally@intel.com'],
-    'aura_compositor': ['danakj+watch@chromium.org',
-                        'jbauman+watch@chromium.org',
-                        'piman+watch@chromium.org',
-                        'sievers+watch@chromium.org',
-                        'kalyan.kondapally@intel.com'],
-    'autofill': ['benquan@chromium.org',
-                 'dgwallinga@chromium.org',
-                 'dyu@chromium.org',
-                 'estade+watch@chromium.org',
-                 'isherman@chromium.org',
-                 'rouslan+autofillwatch@chromium.org'],
-    'automation': ['robertshield@chromium.org'],
-    'base': ['erikwright+watch@chromium.org'],
-    'base_allocator': ['dmikurube+memory@chromium.org',
-                       'wfh+watch@chromium.org'],
-    'base_memory': ['gavinp+memory@chromium.org'],
-    'base_win': ['wfh+watch@chromium.org'],
-    'battery_status': ['timvolodine@chromium.org'],
-    'bookmarks': ['tfarina@chromium.org'],
-    'browser_chromeos': ['davemoore+watch@chromium.org',
-                         'stevenjb+watch@chromium.org',
-                         'nkostylev+watch@chromium.org'],
-    'browser_components': ['browser-components-watch@chromium.org'],
-    'browser_compositor': ['vollick@chromium.org',
-                           'piman+watch@chromium.org'],
-    'browser_resources': ['arv+watch@chromium.org'],
-    'browsing_data': ['markusheintz@chromium.org'],
-    'bubble': ['alicet@chromium.org', 'msw+watch@chromium.org'],
-    'cast': ['avayvod+watch@chromium.org',
-             'hclam+watch@chromium.org',
-             'hguihot+watch@chromium.org',
-             'hubbe+watch@chromium.org',
-             'imcheng+watch@chromium.org',
-             'jasonroberts+watch@google.com',
-             'mikhal+watch@chromium.org',
-             'miu+watch@chromium.org',
-             'pwestin+watch@google.com'],
-    'cc': ['cc-bugs@chromium.org'],
-    'chrome_elf': ['caitkp+watch@chromium.org',],
-    'chrome_views': ['tfarina@chromium.org'],
-    'chromecast': ['lcwu+watch@chromium.org'],
-    'chromedriver': ['stgao@chromium.org'],
-    'chromeos' : ['oshima+watch@chromium.org',
-                  'stevenjb+watch@chromium.org'],
-    'chromeos_attestation' : ['dkrahn+watch@chromium.org'],
-    'chromeos_calculator' : ['dharcourt@chromium.org'],
-    'chromeos_dbus': ['hashimoto+watch@chromium.org'],
-    'chromeos_net' : ['stevenjb+watch@chromium.org'],
-    'chromeos_power' : ['derat+watch@chromium.org'],
-    'chromeos_webui': ['nkostylev+watch@chromium.org'],
-    'clang_update': ['ukai+watch@chromium.org',
-                     'dmikurube+clang@chromium.org',
-                     'eugenis+clang@chromium.org',
-                     'glider+clang@chromium.org'],
-    'clipboard': ['dcheng@chromium.org'],
-    'closure': ['dbeam+watch-closure@chromium.org',
-                'vitalyp+closure@chromium.org'],
-    'content': ['jam@chromium.org',
-                'darin-cc@chromium.org'],
-    'content_input': ['jdduke+watch@chromium.org'],
-    'content_shell': ['jochen+watch@chromium.org'],
-    'cookie_monster': ['erikwright@chromium.org'],
-    'deep_memory_profiler': ['dmikurube+memory@chromium.org'],
-    'device_sensors': ['timvolodine@chromium.org', 'mvanouwerkerk@chromium.org', 'rijubrata.bhaumik@intel.com'],
-    'devtools': ['pfeldman@chromium.org', 'yurys@chromium.org',
-                 'vsevik@chromium.org', 'aandrey+blink@chromium.org',
-                 'paulirish+reviews@chromium.org',
-                 'devtools-reviews@chromium.org'],
-    'disk_cache': ['gavinp+disk@chromium.org'],
-    'dns': ['mmenke@chromium.org'],
-    'download_database': ['benjhayden+dwatch@chromium.org'],
-    'download': ['benjhayden+dwatch@chromium.org', 'asanka@chromium.org'],
-    'downloads_ext': ['benjhayden+dwatch@chromium.org'],
-    'downloads_ui': ['asanka@chromium.org', 'benjhayden+dwatch@chromium.org'],
-    'drive': ['tfarina@chromium.org'],
-    'drive_resource_metadata': ['hashimoto+watch@chromium.org'],
-    'eme': ['eme-reviews@chromium.org'],
-    'events': ['tdresser+watch@chromium.org'],
-    'extension': ['chromium-apps-reviews@chromium.org',
-                  'extensions-reviews@chromium.org'],
-    'fileapi': ['kinuko+fileapi@chromium.org',
-                'nhiroki@chromium.org',
-                'tzik@chromium.org'],
-    'filebrowse': ['rginda+watch@chromium.org',
-                   'yoshiki+watch@chromium.org'],
-    'filesapp': ['mtomasz+watch@chromium.org'],
-    'ftp': ['phajdan.jr@chromium.org'],
-    'gcm': ['zea+watch@chromium.org'],
-    'geolocation': ['mvanouwerkerk@chromium.org'],
-    'gfx_geometry': ['cc-bugs@chromium.org'],
-    'gfx_image': ['rsesek+watch@chromium.org'],
-    'gn': ['tfarina@chromium.org'],
-    'gpu': ['piman+watch@chromium.org'],
-    'history_ui': ['dubroy@chromium.org', 'pam+watch@chromium.org'],
-    'hotword': ['rlp+watch@chromium.org'],
-    'i18n': ['jshin+watch@chromium.org'],
-    'imageburner': ['tbarzic+watch@chromium.org'],
-    'importer': ['tfarina@chromium.org'],
-    'indexed_db': ['cmumford@chromium.org',
-                   'dgrogan@chromium.org', 'jsbell+idb@chromium.org'],
-    'installer': ['grt+watch@chromium.org', 'wfh+watch@chromium.org'],
-    'instant': ['dcblack@chromium.org', 'jered@chromium.org',
-                'dominich@chromium.org', 'samarth+watch@chromium.org',
-                'melevin+watch@chromium.org', 'dougw+watch@chromium.org',
-                'kmadhusu+watch@chromium.org', 'dhollowa+watch@chromium.org',
-                'jfweitz+watch@chromium.org', 'skanuj+watch@chromium.org',
-                'donnd+watch@chromium.org'],
-    'ipc': ['jam@chromium.org', 'darin-cc@chromium.org'],
-    'libwebp': ['urvang@google.com', 'jzern@chromium.org',
-                'skal@google.com', 'vikasa@google.com'],
-    'linux_fonts': ['derat+watch@chromium.org'],
-    'linux_sandboxing': ['jln+watch@chromium.org'],
-    'linux_seccomp_bpf': ['jln+watch@chromium.org'],
-    'supervised_users': ['pam+watch@chromium.org'],
-    'media': ['feature-media-reviews@chromium.org'],
-    'media_galleries': ['gbillock@chromium.org', 'thestig@chromium.org',
-                        'tommycli@chromium.org', 'vandebo@chromium.org'],
-    'message_loop': ['sadrul@chromium.org'],
-    'metrics': ['isherman@chromium.org',
-                'asvitkine+watch@chromium.org'],
-    'metrics_xml_files': ['asvitkine+watch@chromium.org'],
-    'mojo': ['aa@chromium.org',
-             'abarth@chromium.org',
-             'ben+mojo@chromium.org',
-             'darin@chromium.org',
-             'qsr+mojo@chromium.org',
-             'viettrungluu+watch@chromium.org',
-             'yzshen+watch@chromium.org'],
-    'mouse_lock': ['scheib+watch@chromium.org'],
-    'music_manager_private': ['gab+watch@chromium.org',
-                              'erikwright+watch@chromium.org',
-                              'robertshield+watch@chromium.org'],
-    'nacl': ['native-client-reviews@googlegroups.com'],
-    'native_client_sdk': ['sbc@chromium.org', 'binji+watch@chromium.org'],
-    'navigation': ['creis+watch@chromium.org', 'nasko+codewatch@chromium.org'],
-    'net': ['cbentzel+watch@chromium.org'],
-    'net_error_list': ['mmenke@chromium.org'],
-    'net_log': ['mmenke@chromium.org', 'eroman@chromium.org'],
-    'npapi_headers': ['stuartmorgan@chromium.org'],
-    'ntp': ['estade+watch@chromium.org', 'dbeam+watch-ntp@chromium.org',
-            'pedrosimonetti+watch@chromium.org'],
-    'omnibox': ['suzhe@chromium.org'],
-    'options': ['dbeam+watch-options@chromium.org'],
-    'overview_mode': ['tdanderson+overview@chromium.org'],
-    'ozone': ['kalyan.kondapally@intel.com', 'ozone-reviews@chromium.org'],
-    'panels': ['dimich@chromium.org', 'jennb@chromium.org',
-               'dcheng@chromium.org', 'jianli@chromium.org'],
-    'password_manager': ['mkwst+watchlist@chromium.org',
-                         'gcasto+watchlist@chromium.org'],
-    'pepper_api': ['piman+watch@chromium.org', 'ihf+watch@chromium.org',
-                   'yusukes+watch@chromium.org', 'raymes+watch@chromium.org',
-                   'noelallen@chromium.org', 'binji+watch@chromium.org',
-                   'nfullagar@chromium.org', 'teravest+watch@chromium.org',
-                   'tzik@chromium.org'],
-    'plugin': ['jam@chromium.org',
-               'stuartmorgan+watch@chromium.org'],
-    'policy_templates': ['joaodasilva+watch@chromium.org'],
-    'predictors': ['dominich+watch@chromium.org', 'shishir+watch@chromium.org'],
-    'prepopulated_engines': ['vasilii+watch@chromium.org'],
-    'prerender': ['cbentzel+watch@chromium.org', 'tburkard+watch@chromium.org',
-                  'dominich+watch@chromium.org', 'gavinp+prer@chromium.org',
-                  'davidben+watch@chromium.org',],
-    'pyauto': ['anantha@chromium.org',
-               'dyu@chromium.org',
-               'dennisjeffrey@chromium.org'],
-    'remoting': ['chromoting-reviews@chromium.org'],
-    'sessions': ['marja+watch@chromium.org'],
-    'service_worker': ['tzik@chromium.org',
-                       'kinuko+serviceworker@chromium.org',
-                       'nhiroki@chromium.org',
-                       'horo+watch@chromium.org',
-                       'jsbell+serviceworker@chromium.org',
-                       'michaeln@chromium.org',
-                       'serviceworker-reviews@chromium.org'],
-    'site_instance': ['creis+watch@chromium.org', 'ajwong+watch@chromium.org',
-                      'nasko+codewatch@chromium.org'],
-    'spellcheck': ['groby+spellwatch@chromium.org',
-                   'rlp+watch@chromium.org',
-                   'rouslan+spellwatch@chromium.org'],
-    'streams': ['zork+watch@chromium.org'],
-    'sync': ['haitaol+watch@chromium.org',
-             'tim+watch@chromium.org',
-             'maniscalco+watch@chromium.org',
-             'zea+watch@chromium.org'],
-    'syncfs': ['kinuko+fileapi@chromium.org',
-               'nhiroki@chromium.org',
-               'tzik@chromium.org'],
-    'sync_proto': ['albertb+watch@chromium.org'],
-    'tab_capture': ['miu+watch@chromium.org'],
-    'tab_contents': ['avi@chromium.org',
-                     'creis+watch@chromium.org', 'ajwong+watch@chromium.org'],
-    'tab_media_indicators': ['miu+watch@chromium.org'],
-    'tcmalloc': ['dmikurube+memory@chromium.org'],
-    'telemetry': ['telemetry+watch@chromium.org'],
-    'tests': [],
-    'textinput': ['penghuang+watch@chromium.org',
-                  'suzhe@chromium.org',
-                  'yusukes+watch@chromium.org',
-                  'nona+watch@chromium.org',
-                  'yukishiino+watch@chromium.org'],
-    'textinput_chromeos': ['yusukes+watch@chromium.org',
-                           'nona+watch@chromium.org',
-                           'yukishiino+watch@chromium.org'],
-    'tools_emacs': ['dhollowa+watch@chromium.org'],
-    'tracing': ['dsinclair+watch@chromium.org', 'wfh+watch@chromium.org'],
-    'ui_compositor': ['cc-bugs@chromium.org'],
-    'ui_resources': ['oshima+watch@chromium.org'],
-    'valgrind': ['bruening+watch@chromium.org',
-                 'glider+watch@chromium.org',
-                 'timurrrr+watch@chromium.org'],
-    'version_assembly': ['caitkp+watch@chromium.org',
-                         'gab+watch@chromium.org'],
-    'views': ['tfarina@chromium.org'],
-    'views_core': ['ben+views@chromium.org',
-                   'tdanderson+views@chromium.org'],
-    'views_corewm': ['ben+corewm@chromium.org'],
-    'virtual_keyboard': ['dfaden+virtualkb@google.com',
-                         'groby+virtualkb@chromium.org'],
-    'webkit': ['darin-cc@chromium.org'],
-    'webrtc_media': ['wjia+watch@chromium.org',
-                     'mcasas+watch@chromium.org',
-                     'posciak+watch@chromium.org'],
-    'website_settings': ['markusheintz@chromium.org'],
-    'windows_sandboxing': ['wfh+watch@chromium.org'],
-    'worker': ['jam@chromium.org'],
-    'x11': ['derat+watch@chromium.org',
-            'sadrul@chromium.org',
-            'yusukes+watch@chromium.org'],
-  },
-}
diff --git a/android_webview/Android.mk b/android_webview/Android.mk
deleted file mode 100644
index 6897a5a..0000000
--- a/android_webview/Android.mk
+++ /dev/null
@@ -1,379 +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.
-
-# 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)
-
-LOCAL_MODULE := android_webview_java
-
-LOCAL_MODULE_TAGS := optional
-
-# Temporary extra dependency: force android_webview_java_with_new_resources to
-# be built whenever this target is built, so that we get build coverage until
-# the switch happens.
-LOCAL_ADDITIONAL_DEPENDENCIES := \
-    $(call intermediates-dir-for,JAVA_LIBRARIES,android_webview_java_with_new_resources,,COMMON)/javalib.jar
-
-
-include $(LOCAL_PATH)/java_library_common.mk
-# resource glue layer
-LOCAL_SRC_FILES += \
-    $(call all-java-files-under, ../content/public/android/java/resource_map) \
-    $(call all-java-files-under, ../ui/android/java/resource_map) \
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-########################################################
-# This is intended to replace android_webview_java once the Android side of
-# the code that uses the WebView is updated. In the transition period the
-# goal of having this here is to make sure the new build isn't broken.
-include $(CLEAR_VARS)
-LOCAL_MODULE := android_webview_java_with_new_resources
-
-LOCAL_MODULE_TAGS := optional
-
-include $(LOCAL_PATH)/java_library_common.mk
-
-# resources
-include $(LOCAL_PATH)/build/resources_config.mk
-LOCAL_FULL_MANIFEST_FILE := $(android_webview_manifest_file)
-LOCAL_RESOURCE_DIR := $(android_webview_resources_dirs)
-LOCAL_AAPT_FLAGS := $(android_webview_aapt_flags)
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# Depend on the android_webview_strings target to ensure the grd->string.xml
-# processing takes place.
-$(R_file_stamp): $(android_webview_resources_stamp)
-
-########################################################
-# These packages are the resource paks used by webview.
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_pak
-LOCAL_MODULE_STEM := webviewchromium
-LOCAL_BUILT_MODULE_STEM := android_webview_assets/webviewchromium.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_am.pak
-LOCAL_MODULE_STEM := am
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_am.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_ar.pak
-LOCAL_MODULE_STEM := ar
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ar.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_bg.pak
-LOCAL_MODULE_STEM := bg
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_bg.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_bn.pak
-LOCAL_MODULE_STEM := bn
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_bn.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_ca.pak
-LOCAL_MODULE_STEM := ca
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ca.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_cs.pak
-LOCAL_MODULE_STEM := cs
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_cs.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_da.pak
-LOCAL_MODULE_STEM := da
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_da.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_de.pak
-LOCAL_MODULE_STEM := de
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_de.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_el.pak
-LOCAL_MODULE_STEM := el
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_el.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_en-GB.pak
-LOCAL_MODULE_STEM := en-GB
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_en-GB.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_en-US.pak
-LOCAL_MODULE_STEM := en-US
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_en-US.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_es-419.pak
-LOCAL_MODULE_STEM := es-419
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_es-419.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_es.pak
-LOCAL_MODULE_STEM := es
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_es.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_et.pak
-LOCAL_MODULE_STEM := et
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_et.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_fa.pak
-LOCAL_MODULE_STEM := fa
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_fa.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_fil.pak
-LOCAL_MODULE_STEM := fil
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_fil.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_fi.pak
-LOCAL_MODULE_STEM := fi
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_fi.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_fr.pak
-LOCAL_MODULE_STEM := fr
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_fr.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_gu.pak
-LOCAL_MODULE_STEM := gu
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_gu.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_he.pak
-LOCAL_MODULE_STEM := he
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_he.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_hi.pak
-LOCAL_MODULE_STEM := hi
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_hi.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_hr.pak
-LOCAL_MODULE_STEM := hr
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_hr.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_hu.pak
-LOCAL_MODULE_STEM := hu
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_hu.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_id.pak
-LOCAL_MODULE_STEM := id
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_id.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_it.pak
-LOCAL_MODULE_STEM := it
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_it.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_ja.pak
-LOCAL_MODULE_STEM := ja
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ja.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_kn.pak
-LOCAL_MODULE_STEM := kn
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_kn.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_ko.pak
-LOCAL_MODULE_STEM := ko
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ko.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_lt.pak
-LOCAL_MODULE_STEM := lt
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_lt.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_lv.pak
-LOCAL_MODULE_STEM := lv
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_lv.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_ml.pak
-LOCAL_MODULE_STEM := ml
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ml.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_mr.pak
-LOCAL_MODULE_STEM := mr
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_mr.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_ms.pak
-LOCAL_MODULE_STEM := ms
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ms.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_nb.pak
-LOCAL_MODULE_STEM := nb
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_nb.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_nl.pak
-LOCAL_MODULE_STEM := nl
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_nl.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_pl.pak
-LOCAL_MODULE_STEM := pl
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_pl.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_pt-BR.pak
-LOCAL_MODULE_STEM := pt-BR
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_pt-BR.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_pt-PT.pak
-LOCAL_MODULE_STEM := pt-PT
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_pt-PT.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_ro.pak
-LOCAL_MODULE_STEM := ro
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ro.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_ru.pak
-LOCAL_MODULE_STEM := ru
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ru.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_sk.pak
-LOCAL_MODULE_STEM := sk
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_sk.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_sl.pak
-LOCAL_MODULE_STEM := sl
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_sl.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_sr.pak
-LOCAL_MODULE_STEM := sr
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_sr.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_sv.pak
-LOCAL_MODULE_STEM := sv
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_sv.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_sw.pak
-LOCAL_MODULE_STEM := sw
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_sw.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_ta.pak
-LOCAL_MODULE_STEM := ta
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ta.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_te.pak
-LOCAL_MODULE_STEM := te
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_te.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_th.pak
-LOCAL_MODULE_STEM := th
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_th.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_tr.pak
-LOCAL_MODULE_STEM := tr
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_tr.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_uk.pak
-LOCAL_MODULE_STEM := uk
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_uk.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_vi.pak
-LOCAL_MODULE_STEM := vi
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_vi.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak
-LOCAL_MODULE_STEM := zh-CN
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_zh-CN.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak
-LOCAL_MODULE_STEM := zh-TW
-LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_zh-TW.pak
-include $(LOCAL_PATH)/webview_pak.mk
diff --git a/android_webview/DEPS b/android_webview/DEPS
deleted file mode 100644
index b2c547c..0000000
--- a/android_webview/DEPS
+++ /dev/null
@@ -1,23 +0,0 @@
-# Please include benm@ and (erikwright@) on the review for any changes
-# to DEPS files under android_webview/
-
-# Do not add any includes under chrome/ anywhere in android_webview.
-
-include_rules = [
-  # lib is the top-level target, and must remain a leaf in the dependency tree.
-  "-android_webview/lib",
-
-  "+components/data_reduction_proxy",
-  "+content/browser/media/android",
-  "+content/public/common",
-  "+crypto",
-  "+gpu",
-  "+jni",
-  "+net",
-  "+skia",
-  "+third_party/skia/include",
-  "+ui/android",
-  "+ui/base",
-  "+ui/gfx",
-  "+webkit/common/gpu"
-]
diff --git a/android_webview/OWNERS b/android_webview/OWNERS
deleted file mode 100644
index bc9ff04..0000000
--- a/android_webview/OWNERS
+++ /dev/null
@@ -1,7 +0,0 @@
-benm@chromium.org
-boliu@chromium.org
-michaelbai@chromium.org
-mkosiba@chromium.org
-mnaganov@chromium.org
-sgurun@chromium.org
-torne@chromium.org
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
deleted file mode 100644
index d2259dc8..0000000
--- a/android_webview/android_webview.gyp
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 2009 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': 'android_webview_pak',
-      'type': 'none',
-      'dependencies': [
-        '<(DEPTH)/content/app/resources/content_resources.gyp:content_resources',
-        '<(DEPTH)/net/net.gyp:net_resources',
-        '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
-        '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
-      ],
-      'actions': [
-        {
-          'action_name': 'repack_android_webview_pack',
-          'variables': {
-            'pak_inputs': [
-              '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
-            ],
-            'pak_output': '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
-          },
-         'includes': [ '../build/repack_action.gypi' ],
-        },
-        {
-          'action_name': 'add_en_US_pak_locale',
-          'variables': {
-            'pak_inputs': ['<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak'],
-            'pak_output': '<(PRODUCT_DIR)/android_webview_assets/en-US.pak',
-          },
-         'includes': [ '../build/repack_action.gypi' ],
-        }
-      ],
-    },
-    {
-      'target_name': 'android_webview_strings_grd',
-      'android_unmangled_name': 1,
-      'type': 'none',
-      'variables': {
-        'grd_file': '../android_webview/java/strings/android_webview_strings.grd',
-      },
-      'includes': [
-          '../build/java_strings_grd.gypi',
-      ],
-    },
-    {
-      'target_name': 'android_webview_common',
-      'type': 'static_library',
-      'dependencies': [
-        '../android_webview/native/webview_native.gyp:webview_native',
-        '../components/components.gyp:auto_login_parser',
-        '../components/components.gyp:autofill_content_renderer',
-        '../components/components.gyp:cdm_browser',
-        '../components/components.gyp:cdm_renderer',
-        '../components/components.gyp:data_reduction_proxy_browser',
-        '../components/components.gyp:navigation_interception',
-        '../components/components.gyp:visitedlink_browser',
-        '../components/components.gyp:visitedlink_renderer',
-        '../components/components.gyp:web_contents_delegate_android',
-        '../content/content.gyp:content_app_both',
-        '../content/content.gyp:content_browser',
-        '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
-        '../gpu/gpu.gyp:command_buffer_service',
-        '../gpu/gpu.gyp:gles2_implementation',
-        '../gpu/gpu.gyp:gl_in_process_context',
-        '../media/media.gyp:media',
-        '../printing/printing.gyp:printing',
-        '../skia/skia.gyp:skia',
-        '../third_party/WebKit/public/blink.gyp:blink',
-        '../ui/gl/gl.gyp:gl',
-        '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
-        '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
-        'android_webview_pak',
-      ],
-      'include_dirs': [
-        '..',
-        '../skia/config',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/resources/',
-      ],
-      'sources': [
-        'browser/aw_browser_context.cc',
-        'browser/aw_browser_context.h',
-        'browser/aw_browser_main_parts.cc',
-        'browser/aw_browser_main_parts.h',
-        'browser/aw_browser_permission_request_delegate.h',
-        'browser/aw_contents_client_bridge_base.cc',
-        'browser/aw_contents_client_bridge_base.h',
-        'browser/aw_content_browser_client.cc',
-        'browser/aw_content_browser_client.h',
-        'browser/aw_contents_io_thread_client.h',
-        'browser/aw_cookie_access_policy.cc',
-        'browser/aw_cookie_access_policy.h',
-        'browser/aw_download_manager_delegate.cc',
-        'browser/aw_download_manager_delegate.h',
-        'browser/aw_form_database_service.cc',
-        'browser/aw_form_database_service.h',
-        'browser/aw_gl_surface.cc',
-        'browser/aw_gl_surface.h',
-        'browser/aw_http_auth_handler_base.cc',
-        'browser/aw_http_auth_handler_base.h',
-        'browser/aw_javascript_dialog_manager.cc',
-        'browser/aw_javascript_dialog_manager.h',
-        'browser/aw_login_delegate.cc',
-        'browser/aw_login_delegate.h',
-        'browser/aw_pref_store.cc',
-        'browser/aw_pref_store.h',
-        'browser/aw_quota_manager_bridge.cc',
-        'browser/aw_quota_manager_bridge.h',
-        'browser/aw_quota_permission_context.cc',
-        'browser/aw_quota_permission_context.h',
-        'browser/aw_request_interceptor.cc',
-        'browser/aw_request_interceptor.h',
-        'browser/aw_resource_context.cc',
-        'browser/aw_resource_context.h',
-        'browser/aw_result_codes.h',
-        'browser/aw_web_preferences_populater.cc',
-        'browser/aw_web_preferences_populater.h',
-        'browser/aw_web_resource_response.cc',
-        'browser/aw_web_resource_response.h',
-        'browser/browser_view_renderer.cc',
-        'browser/browser_view_renderer.h',
-        'browser/browser_view_renderer_client.h',
-        'browser/deferred_gpu_command_service.cc',
-        'browser/deferred_gpu_command_service.h',
-        'browser/find_helper.cc',
-        'browser/find_helper.h',
-        'browser/global_tile_manager.cc',
-        'browser/global_tile_manager.h',
-        'browser/global_tile_manager_client.h',
-        'browser/gpu_memory_buffer_factory_impl.cc',
-        'browser/gpu_memory_buffer_factory_impl.h',
-        'browser/hardware_renderer.cc',
-        'browser/hardware_renderer.h',
-        'browser/icon_helper.cc',
-        'browser/icon_helper.h',
-        'browser/input_stream.h',
-        'browser/jni_dependency_factory.h',
-        'browser/gl_view_renderer_manager.cc',
-        'browser/gl_view_renderer_manager.h',
-        'browser/net/android_stream_reader_url_request_job.cc',
-        'browser/net/android_stream_reader_url_request_job.h',
-        'browser/net/aw_network_delegate.cc',
-        'browser/net/aw_network_delegate.h',
-        'browser/net/aw_url_request_context_getter.cc',
-        'browser/net/aw_url_request_context_getter.h',
-        'browser/net/aw_url_request_job_factory.cc',
-        'browser/net/aw_url_request_job_factory.h',
-        'browser/net_disk_cache_remover.cc',
-        'browser/net_disk_cache_remover.h',
-        'browser/net/init_native_callback.h',
-        'browser/net/input_stream_reader.cc',
-        'browser/net/input_stream_reader.h',
-        'browser/parent_compositor_draw_constraints.cc',
-        'browser/parent_compositor_draw_constraints.h',
-        'browser/parent_output_surface.cc',
-        'browser/parent_output_surface.h',
-        'browser/renderer_host/aw_render_view_host_ext.cc',
-        'browser/renderer_host/aw_render_view_host_ext.h',
-        'browser/renderer_host/aw_resource_dispatcher_host_delegate.cc',
-        'browser/renderer_host/aw_resource_dispatcher_host_delegate.h',
-        'browser/renderer_host/print_manager.cc',
-        'browser/renderer_host/print_manager.h',
-        'browser/scoped_allow_wait_for_legacy_web_view_api.h',
-        'browser/scoped_app_gl_state_restore.cc',
-        'browser/scoped_app_gl_state_restore.h',
-        'browser/shared_renderer_state.cc',
-        'browser/shared_renderer_state.h',
-        'common/android_webview_message_generator.cc',
-        'common/android_webview_message_generator.h',
-        'common/aw_content_client.cc',
-        'common/aw_content_client.h',
-        'common/aw_hit_test_data.cc',
-        'common/aw_hit_test_data.h',
-        'common/aw_resource.h',
-        'common/aw_switches.cc',
-        'common/aw_switches.h',
-        'common/devtools_instrumentation.h',
-        'common/print_messages.cc',
-        'common/print_messages.h',
-        'common/render_view_messages.cc',
-        'common/render_view_messages.h',
-        'common/url_constants.cc',
-        'common/url_constants.h',
-        'lib/aw_browser_dependency_factory_impl.cc',
-        'lib/aw_browser_dependency_factory_impl.h',
-        'lib/main/aw_main_delegate.cc',
-        'lib/main/aw_main_delegate.h',
-        'public/browser/draw_gl.h',
-        'renderer/aw_content_renderer_client.cc',
-        'renderer/aw_content_renderer_client.h',
-        'renderer/aw_key_systems.cc',
-        'renderer/aw_key_systems.h',
-        'renderer/aw_permission_client.cc',
-        'renderer/aw_permission_client.h',
-        'renderer/aw_render_process_observer.cc',
-        'renderer/aw_render_process_observer.h',
-        'renderer/aw_render_frame_ext.cc',
-        'renderer/aw_render_frame_ext.h',
-        'renderer/aw_render_view_ext.cc',
-        'renderer/aw_render_view_ext.h',
-        'renderer/print_web_view_helper.cc',
-        'renderer/print_web_view_helper.h',
-        'renderer/print_web_view_helper_android.cc',
-        'renderer/print_web_view_helper_linux.cc',
-        'renderer/print_render_frame_observer.cc',
-        'renderer/print_render_frame_observer.h',
-      ],
-    },
-    {
-      'target_name': 'libwebviewchromium',
-      'includes': [
-          'libwebviewchromium.gypi',
-      ],
-    }
-  ],
-  'conditions': [
-    ['android_webview_build==0', {
-      'includes': [
-        'android_webview_tests.gypi',
-        '../third_party/android_webview_glue/android_webview_glue.gypi',
-      ],
-      'targets': [
-        {
-          'target_name': 'android_webview_java',
-          'type': 'none',
-          'dependencies': [
-            '../components/components.gyp:navigation_interception_java',
-            '../components/components.gyp:web_contents_delegate_android_java',
-            '../content/content.gyp:content_java',
-            '../ui/android/ui_android.gyp:ui_java',
-            'android_webview_strings_grd',
-          ],
-          'variables': {
-            'java_in_dir': '../android_webview/java',
-          },
-          'includes': [ '../build/java.gypi' ],
-        },
-      ],
-     }, {  # android_webview_build==1
-      'targets': [
-        {
-          'target_name': 'android_webview_jarjar_ui_resources',
-          'android_unmangled_name': 1,
-          'type': 'none',
-          'variables': {
-            'res_dir': '../ui/android/java/res',
-            'rules_file': '../android_webview/build/jarjar-rules.txt',
-          },
-          'includes': ['../android_webview/build/jarjar_resources.gypi'],
-        },
-        {
-          'target_name': 'android_webview_jarjar_content_resources',
-          'android_unmangled_name': 1,
-          'type': 'none',
-          'variables': {
-            'res_dir': '../content/public/android/java/res',
-            'rules_file': '../android_webview/build/jarjar-rules.txt',
-          },
-          'includes': ['../android_webview/build/jarjar_resources.gypi'],
-        },
-        {
-          'target_name': 'android_webview_resources',
-          'type': 'none',
-          'android_unmangled_name': 1,
-          'dependencies': [
-            '../content/content.gyp:content_strings_grd',
-            '../ui/android/ui_android.gyp:ui_strings_grd',
-            'android_webview_jarjar_content_resources',
-            'android_webview_jarjar_ui_resources',
-            'android_webview_strings_grd',
-          ],
-        },
-      ],
-    }],
-  ],
-}
diff --git a/android_webview/android_webview_telemetry_shell.gyp b/android_webview/android_webview_telemetry_shell.gyp
deleted file mode 100644
index 7d812ff..0000000
--- a/android_webview/android_webview_telemetry_shell.gyp
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2014 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.
-{
-  'targets': [
-    {
-      'target_name': 'android_webview_telemetry_shell_apk',
-      'type': 'none',
-      'variables': {
-        'apk_name': 'AndroidWebViewTelemetryShell',
-        'java_in_dir': 'tools/WebViewTelemetryShell',
-        'resource_dir': 'tools/WebViewTelemetryShell/res',
-      },
-      'includes': [ '../build/java_apk.gypi' ],
-    },
-  ],
-}
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
deleted file mode 100644
index ff7f2af..0000000
--- a/android_webview/android_webview_tests.gypi
+++ /dev/null
@@ -1,188 +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.
-{
-  'targets': [
-    {
-      'target_name': 'android_webview_apk',
-      'type': 'none',
-      'dependencies': [
-        'libstandalonelibwebviewchromium',
-        'android_webview_java',
-        'android_webview_pak',
-        'libdrawgl',
-      ],
-      'variables': {
-        'apk_name': 'AndroidWebView',
-        'java_in_dir': 'test/shell',
-        'native_lib_target': 'libstandalonelibwebviewchromium',
-        'resource_dir': 'test/shell/res',
-        'extensions_to_not_compress': 'pak',
-        'extra_native_libs': ['<(SHARED_LIB_DIR)/libdrawgl.>(android_product_extension)'],
-        'additional_input_paths': [
-          '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
-          '<(PRODUCT_DIR)/android_webview_assets/en-US.pak',
-          '<(PRODUCT_DIR)/android_webview_apk/assets/asset_file.html',
-          '<(PRODUCT_DIR)/android_webview_apk/assets/cookie_test.html',
-          '<(PRODUCT_DIR)/android_webview_apk/assets/asset_icon.png',
-          '<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video_test.html',
-        ],
-        'conditions': [
-          ['icu_use_data_file_flag==1', {
-            'additional_input_paths': [
-              '<(PRODUCT_DIR)/icudtl.dat',
-            ],
-          }],
-        ],
-      },
-      'copies': [
-        {
-          'destination': '<(PRODUCT_DIR)/android_webview_apk/assets',
-          'files': [
-            '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
-            '<(PRODUCT_DIR)/android_webview_assets/en-US.pak',
-            '<(java_in_dir)/assets/asset_file.html',
-            '<(java_in_dir)/assets/asset_icon.png',
-            '<(java_in_dir)/assets/cookie_test.html',
-            '<(java_in_dir)/assets/full_screen_video_test.html',
-          ],
-	  'conditions': [
-            ['icu_use_data_file_flag==1', {
-              'files': [
-                '<(PRODUCT_DIR)/icudtl.dat',
-              ],
-	    }],
-          ],
-        },
-      ],
-      'includes': [ '../build/java_apk.gypi' ],
-    },
-    {
-      # android_webview_apk creates a .jar as a side effect. Any java
-      # targets that need that .jar in their classpath should depend on this
-      # target. For more details see the chrome_shell_apk_java target.
-      'target_name': 'android_webview_apk_java',
-      'type': 'none',
-      'dependencies': [
-        'android_webview_apk',
-      ],
-      'includes': [ '../build/apk_fake_jar.gypi' ],
-    },
-    {
-      'target_name': 'android_webview_test_apk',
-      'type': 'none',
-      'dependencies': [
-        '../base/base.gyp:base_java_test_support',
-        '../content/content_shell_and_tests.gyp:content_java_test_support',
-        '../net/net.gyp:net_java_test_support',
-        'android_webview_apk_java',
-      ],
-      'variables': {
-        'apk_name': 'AndroidWebViewTest',
-        'java_in_dir': '../android_webview/javatests',
-        'is_test_apk': 1,
-      },
-      'includes': [ '../build/java_apk.gypi' ],
-    },
-    {
-      'target_name': 'android_webview_unittests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        '../base/base.gyp:test_support_base',
-        '../content/content_shell_and_tests.gyp:test_support_content',
-        '../net/net.gyp:net_test_support',
-        '../testing/android/native_test.gyp:native_test_native_code',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        '../ui/base/ui_base.gyp:ui_base_jni_headers',
-        'android_webview_common',
-        'android_webview_unittests_jni',
-      ],
-      'include_dirs': [
-        '..',
-        '../skia/config',
-        '<(SHARED_INTERMEDIATE_DIR)/android_webview_unittests',
-      ],
-      'sources': [
-        'browser/aw_static_cookie_policy_unittest.cc',
-        'browser/aw_form_database_service_unittest.cc',
-        'browser/global_tile_manager_unittest.cc',
-        'browser/net/android_stream_reader_url_request_job_unittest.cc',
-        'browser/net/input_stream_reader_unittest.cc',
-        'lib/main/webview_tests.cc',
-        'native/aw_contents_client_bridge_unittest.cc',
-        'native/aw_media_url_interceptor_unittest.cc',
-        'native/input_stream_unittest.cc',
-        'native/permission/media_access_permission_request_unittest.cc',
-        'native/permission/permission_request_handler_unittest.cc',
-        'native/state_serializer_unittest.cc',
-      ],
-    },
-    {
-      'target_name': 'android_webview_unittest_java',
-      'type': 'none',
-      'dependencies': [
-        '../base/base.gyp:base_java_test_support',
-        '../content/content_shell_and_tests.gyp:content_java_test_support',
-        'android_webview_java',
-      ],
-      'variables': {
-        'java_in_dir': '../android_webview/unittestjava',
-      },
-      'includes': [ '../build/java.gypi' ],
-    },
-    {
-      'target_name': 'android_webview_unittests_jni',
-      'type': 'none',
-      'sources': [
-          '../android_webview/unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java',
-          '../android_webview/unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java',
-      ],
-      'variables': {
-        'jni_gen_package': 'android_webview_unittests',
-      },
-      'includes': [ '../build/jni_generator.gypi' ],
-    },
-    {
-      'target_name': 'android_webview_unittests_apk',
-      'type': 'none',
-      'dependencies': [
-        'android_webview_unittest_java',
-        'android_webview_unittests',
-      ],
-      'variables': {
-        'test_suite_name': 'android_webview_unittests',
-        'additional_input_paths': [
-          '<(PRODUCT_DIR)/android_webview_unittests_apk/assets/asset_file.ogg',
-        ],
-      },
-      'copies': [
-        {
-          'destination': '<(PRODUCT_DIR)/android_webview_unittests_apk/assets',
-          'files': [
-            'test/unittest/assets/asset_file.ogg',
-          ],
-        },
-      ],
-      'includes': [ '../build/apk_test.gypi' ],
-    },
-    {
-      'target_name': 'libdrawgl',
-      'type': 'shared_library',
-      # Do not depend on any other component here, since this target
-      # builds a separate shared library!
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-          '../android_webview/test/shell/src/draw_gl/draw_gl.cc',
-      ],
-    },
-    {
-      'target_name': 'libstandalonelibwebviewchromium',
-      'includes': [
-        'libwebviewchromium.gypi',
-      ],
-    },
-  ],
-}
diff --git a/android_webview/browser/DEPS b/android_webview/browser/DEPS
deleted file mode 100644
index 644c67b..0000000
--- a/android_webview/browser/DEPS
+++ /dev/null
@@ -1,41 +0,0 @@
-include_rules = [
-  "-android_webview",
-  "+android_webview/browser",
-  "+android_webview/common",
-  "+android_webview/native",
-  "+android_webview/public/browser",
-
-  "+cc",
-  "-cc/blink",
-  "-cc/surfaces",
-
-  "+components/auto_login_parser",
-  "+components/autofill/content/browser",
-  "+components/autofill/core/browser",
-  "+components/autofill/core/common",
-  "+components/cdm/browser",
-  "+components/data_reduction_proxy/browser",
-  "+components/navigation_interception",
-  "+components/user_prefs",
-  "+components/visitedlink/browser",
-  "+components/webdata/common",
-
-  "+content/public/browser",
-  "+content/public/test",
-
-  "+printing",
-
-  "+ui/gfx",
-  "+ui/gl",
-
-  "+webkit/gpu",
-
-  # Temporary until we bundle our own favicon. See
-  # AwContentBrowserClient::GetDefaultFavicon
-  "!ui/resources/grit/ui_resources.h",
-
-  # POD structure required by the find-in-page IPC messages.
-  "+third_party/WebKit/public/web/WebFindOptions.h",
-  # Interface required for in-process input event handling.
-  "+third_party/WebKit/public/web/WebCompositorInputHandler.h"
-]
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
deleted file mode 100644
index 51e5f93..0000000
--- a/android_webview/browser/aw_browser_context.cc
+++ /dev/null
@@ -1,300 +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.
-
-#include "android_webview/browser/aw_browser_context.h"
-
-#include "android_webview/browser/aw_form_database_service.h"
-#include "android_webview/browser/aw_pref_store.h"
-#include "android_webview/browser/aw_quota_manager_bridge.h"
-#include "android_webview/browser/aw_resource_context.h"
-#include "android_webview/browser/jni_dependency_factory.h"
-#include "android_webview/browser/net/aw_url_request_context_getter.h"
-#include "android_webview/browser/net/init_native_callback.h"
-#include "base/bind.h"
-#include "base/prefs/pref_registry_simple.h"
-#include "base/prefs/pref_service.h"
-#include "base/prefs/pref_service_factory.h"
-#include "components/autofill/core/common/autofill_pref_names.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_config_service.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_prefs.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
-#include "components/user_prefs/user_prefs.h"
-#include "components/visitedlink/browser/visitedlink_master.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/ssl_host_state_delegate.h"
-#include "content/public/browser/storage_partition.h"
-#include "content/public/browser/web_contents.h"
-#include "net/cookies/cookie_store.h"
-#include "net/proxy/proxy_service.h"
-
-using base::FilePath;
-using content::BrowserThread;
-using data_reduction_proxy::DataReductionProxyConfigService;
-using data_reduction_proxy::DataReductionProxySettings;
-
-namespace android_webview {
-
-namespace {
-
-// Shows notifications which correspond to PersistentPrefStore's reading errors.
-void HandleReadError(PersistentPrefStore::PrefReadError error) {
-}
-
-AwBrowserContext* g_browser_context = NULL;
-
-}  // namespace
-
-// Data reduction proxy is disabled by default.
-bool AwBrowserContext::data_reduction_proxy_enabled_ = false;
-
-AwBrowserContext::AwBrowserContext(
-    const FilePath path,
-    JniDependencyFactory* native_factory)
-    : context_storage_path_(path),
-      native_factory_(native_factory) {
-  DCHECK(!g_browser_context);
-  g_browser_context = this;
-
-  // This constructor is entered during the creation of ContentBrowserClient,
-  // before browser threads are created. Therefore any checks to enforce
-  // threading (such as BrowserThread::CurrentlyOn()) will fail here.
-}
-
-AwBrowserContext::~AwBrowserContext() {
-  DCHECK_EQ(this, g_browser_context);
-  g_browser_context = NULL;
-}
-
-// static
-AwBrowserContext* AwBrowserContext::GetDefault() {
-  // TODO(joth): rather than store in a global here, lookup this instance
-  // from the Java-side peer.
-  return g_browser_context;
-}
-
-// static
-AwBrowserContext* AwBrowserContext::FromWebContents(
-    content::WebContents* web_contents) {
-  // This is safe; this is the only implementation of the browser context.
-  return static_cast<AwBrowserContext*>(web_contents->GetBrowserContext());
-}
-
-// static
-void AwBrowserContext::SetDataReductionProxyEnabled(bool enabled) {
-  // Cache the setting value. It is possible that data reduction proxy is
-  // not created yet.
-  data_reduction_proxy_enabled_ = enabled;
-  AwBrowserContext* context = AwBrowserContext::GetDefault();
-  // Can't enable Data reduction proxy if user pref service is not ready.
-  if (context == NULL || context->user_pref_service_.get() == NULL)
-    return;
-  DataReductionProxySettings* proxy_settings =
-      context->GetDataReductionProxySettings();
-  if (proxy_settings == NULL)
-    return;
-  proxy_settings->SetDataReductionProxyEnabled(data_reduction_proxy_enabled_);
-}
-
-void AwBrowserContext::PreMainMessageLoopRun() {
-  cookie_store_ = CreateCookieStore(this);
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
-  data_reduction_proxy_settings_.reset(
-      new DataReductionProxySettings(
-          new data_reduction_proxy::DataReductionProxyParams(
-              data_reduction_proxy::DataReductionProxyParams::kAllowed)));
-#endif
-  scoped_ptr<DataReductionProxyConfigService>
-      data_reduction_proxy_config_service(
-          new DataReductionProxyConfigService(
-              scoped_ptr<net::ProxyConfigService>(
-                  net::ProxyService::CreateSystemProxyConfigService(
-                      BrowserThread::GetMessageLoopProxyForThread(
-                          BrowserThread::IO),
-                          NULL /* Ignored on Android */)).Pass()));
-  if (data_reduction_proxy_settings_.get()) {
-      data_reduction_proxy_configurator_.reset(
-          new data_reduction_proxy::DataReductionProxyConfigTracker(
-              base::Bind(&DataReductionProxyConfigService::UpdateProxyConfig,
-                         base::Unretained(
-                             data_reduction_proxy_config_service.get())),
-            BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
-    data_reduction_proxy_settings_->SetProxyConfigurator(
-        data_reduction_proxy_configurator_.get());
-  }
-
-  url_request_context_getter_ =
-      new AwURLRequestContextGetter(GetPath(),
-                                    cookie_store_.get(),
-                                    data_reduction_proxy_config_service.Pass());
-
-  visitedlink_master_.reset(
-      new visitedlink::VisitedLinkMaster(this, this, false));
-  visitedlink_master_->Init();
-
-  form_database_service_.reset(
-      new AwFormDatabaseService(context_storage_path_));
-}
-
-void AwBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) {
-  DCHECK(visitedlink_master_);
-  visitedlink_master_->AddURLs(urls);
-}
-
-net::URLRequestContextGetter* AwBrowserContext::CreateRequestContext(
-    content::ProtocolHandlerMap* protocol_handlers,
-    content::URLRequestInterceptorScopedVector request_interceptors) {
-  // This function cannot actually create the request context because
-  // there is a reentrant dependency on GetResourceContext() via
-  // content::StoragePartitionImplMap::Create(). This is not fixable
-  // until http://crbug.com/159193. Until then, assert that the context
-  // has already been allocated and just handle setting the protocol_handlers.
-  DCHECK(url_request_context_getter_);
-  url_request_context_getter_->SetHandlersAndInterceptors(
-      protocol_handlers, request_interceptors.Pass());
-  return url_request_context_getter_;
-}
-
-net::URLRequestContextGetter*
-AwBrowserContext::CreateRequestContextForStoragePartition(
-    const base::FilePath& partition_path,
-    bool in_memory,
-    content::ProtocolHandlerMap* protocol_handlers,
-    content::URLRequestInterceptorScopedVector request_interceptors) {
-  NOTREACHED();
-  return NULL;
-}
-
-AwQuotaManagerBridge* AwBrowserContext::GetQuotaManagerBridge() {
-  if (!quota_manager_bridge_.get()) {
-    quota_manager_bridge_ = native_factory_->CreateAwQuotaManagerBridge(this);
-  }
-  return quota_manager_bridge_.get();
-}
-
-AwFormDatabaseService* AwBrowserContext::GetFormDatabaseService() {
-  return form_database_service_.get();
-}
-
-DataReductionProxySettings* AwBrowserContext::GetDataReductionProxySettings() {
-  return data_reduction_proxy_settings_.get();
-}
-
-AwURLRequestContextGetter* AwBrowserContext::GetAwURLRequestContext() {
-  return url_request_context_getter_.get();
-}
-
-// Create user pref service for autofill functionality.
-void AwBrowserContext::CreateUserPrefServiceIfNecessary() {
-  if (user_pref_service_)
-    return;
-
-  PrefRegistrySimple* pref_registry = new PrefRegistrySimple();
-  // We only use the autocomplete feature of the Autofill, which is
-  // controlled via the manager_delegate. We don't use the rest
-  // of autofill, which is why it is hardcoded as disabled here.
-  pref_registry->RegisterBooleanPref(
-      autofill::prefs::kAutofillEnabled, false);
-  pref_registry->RegisterDoublePref(
-      autofill::prefs::kAutofillPositiveUploadRate, 0.0);
-  pref_registry->RegisterDoublePref(
-      autofill::prefs::kAutofillNegativeUploadRate, 0.0);
-  data_reduction_proxy::RegisterSimpleProfilePrefs(pref_registry);
-  data_reduction_proxy::RegisterPrefs(pref_registry);
-
-  base::PrefServiceFactory pref_service_factory;
-  pref_service_factory.set_user_prefs(make_scoped_refptr(new AwPrefStore()));
-  pref_service_factory.set_read_error_callback(base::Bind(&HandleReadError));
-  user_pref_service_ = pref_service_factory.Create(pref_registry).Pass();
-
-  user_prefs::UserPrefs::Set(this, user_pref_service_.get());
-
-  if (data_reduction_proxy_settings_.get()) {
-    data_reduction_proxy_settings_->InitDataReductionProxySettings(
-        user_pref_service_.get(),
-        user_pref_service_.get(),
-        GetRequestContext());
-
-    data_reduction_proxy_settings_->SetDataReductionProxyEnabled(
-        data_reduction_proxy_enabled_);
-  }
-}
-
-base::FilePath AwBrowserContext::GetPath() const {
-  return context_storage_path_;
-}
-
-bool AwBrowserContext::IsOffTheRecord() const {
-  // Android WebView does not support off the record profile yet.
-  return false;
-}
-
-net::URLRequestContextGetter* AwBrowserContext::GetRequestContext() {
-  return GetDefaultStoragePartition(this)->GetURLRequestContext();
-}
-
-net::URLRequestContextGetter*
-AwBrowserContext::GetRequestContextForRenderProcess(
-    int renderer_child_id) {
-  return GetRequestContext();
-}
-
-net::URLRequestContextGetter* AwBrowserContext::GetMediaRequestContext() {
-  return GetRequestContext();
-}
-
-net::URLRequestContextGetter*
-AwBrowserContext::GetMediaRequestContextForRenderProcess(
-    int renderer_child_id) {
-  return GetRequestContext();
-}
-
-net::URLRequestContextGetter*
-AwBrowserContext::GetMediaRequestContextForStoragePartition(
-    const base::FilePath& partition_path,
-    bool in_memory) {
-  NOTREACHED();
-  return NULL;
-}
-
-content::ResourceContext* AwBrowserContext::GetResourceContext() {
-  if (!resource_context_) {
-    resource_context_.reset(
-        new AwResourceContext(url_request_context_getter_.get()));
-  }
-  return resource_context_.get();
-}
-
-content::DownloadManagerDelegate*
-AwBrowserContext::GetDownloadManagerDelegate() {
-  return &download_manager_delegate_;
-}
-
-content::BrowserPluginGuestManager* AwBrowserContext::GetGuestManager() {
-  return NULL;
-}
-
-storage::SpecialStoragePolicy* AwBrowserContext::GetSpecialStoragePolicy() {
-  // Intentionally returning NULL as 'Extensions' and 'Apps' not supported.
-  return NULL;
-}
-
-content::PushMessagingService* AwBrowserContext::GetPushMessagingService() {
-  // TODO(johnme): Support push messaging in WebView.
-  return NULL;
-}
-
-content::SSLHostStateDelegate* AwBrowserContext::GetSSLHostStateDelegate() {
-  return NULL;
-}
-
-void AwBrowserContext::RebuildTable(
-    const scoped_refptr<URLEnumerator>& enumerator) {
-  // Android WebView rebuilds from WebChromeClient.getVisitedHistory. The client
-  // can change in the lifetime of this WebView and may not yet be set here.
-  // Therefore this initialization path is not used.
-  enumerator->OnComplete(true);
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_browser_context.h b/android_webview/browser/aw_browser_context.h
deleted file mode 100644
index b099e21..0000000
--- a/android_webview/browser/aw_browser_context.h
+++ /dev/null
@@ -1,147 +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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_BROWSER_CONTEXT_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_BROWSER_CONTEXT_H_
-
-#include <vector>
-
-#include "android_webview/browser/aw_download_manager_delegate.h"
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/files/file_path.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "components/visitedlink/browser/visitedlink_delegate.h"
-#include "content/public/browser/browser_context.h"
-#include "content/public/browser/content_browser_client.h"
-#include "net/url_request/url_request_job_factory.h"
-
-class GURL;
-class PrefService;
-
-namespace content {
-class ResourceContext;
-class SSLHostStateDelegate;
-class WebContents;
-}
-
-namespace data_reduction_proxy {
-class DataReductionProxyConfigurator;
-class DataReductionProxySettings;
-}
-
-namespace net {
-class CookieStore;
-}
-
-namespace visitedlink {
-class VisitedLinkMaster;
-}
-
-namespace android_webview {
-
-class AwFormDatabaseService;
-class AwQuotaManagerBridge;
-class AwURLRequestContextGetter;
-class JniDependencyFactory;
-
-class AwBrowserContext : public content::BrowserContext,
-                         public visitedlink::VisitedLinkDelegate {
- public:
-
-  AwBrowserContext(const base::FilePath path,
-                   JniDependencyFactory* native_factory);
-  virtual ~AwBrowserContext();
-
-  // Currently only one instance per process is supported.
-  static AwBrowserContext* GetDefault();
-
-  // Convenience method to returns the AwBrowserContext corresponding to the
-  // given WebContents.
-  static AwBrowserContext* FromWebContents(
-      content::WebContents* web_contents);
-
-  static void SetDataReductionProxyEnabled(bool enabled);
-
-  // Maps to BrowserMainParts::PreMainMessageLoopRun.
-  void PreMainMessageLoopRun();
-
-  // These methods map to Add methods in visitedlink::VisitedLinkMaster.
-  void AddVisitedURLs(const std::vector<GURL>& urls);
-
-  net::URLRequestContextGetter* CreateRequestContext(
-      content::ProtocolHandlerMap* protocol_handlers,
-      content::URLRequestInterceptorScopedVector request_interceptors);
-  net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
-      const base::FilePath& partition_path,
-      bool in_memory,
-      content::ProtocolHandlerMap* protocol_handlers,
-      content::URLRequestInterceptorScopedVector request_interceptors);
-
-  AwQuotaManagerBridge* GetQuotaManagerBridge();
-
-  AwFormDatabaseService* GetFormDatabaseService();
-
-  data_reduction_proxy::DataReductionProxySettings*
-      GetDataReductionProxySettings();
-
-  AwURLRequestContextGetter* GetAwURLRequestContext();
-
-  void CreateUserPrefServiceIfNecessary();
-
-  // content::BrowserContext implementation.
-  virtual base::FilePath GetPath() const OVERRIDE;
-  virtual bool IsOffTheRecord() const OVERRIDE;
-  virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
-  virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(
-      int renderer_child_id) OVERRIDE;
-  virtual net::URLRequestContextGetter* GetMediaRequestContext() OVERRIDE;
-  virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
-      int renderer_child_id) OVERRIDE;
-  virtual net::URLRequestContextGetter*
-      GetMediaRequestContextForStoragePartition(
-          const base::FilePath& partition_path, bool in_memory) OVERRIDE;
-  virtual content::ResourceContext* GetResourceContext() OVERRIDE;
-  virtual content::DownloadManagerDelegate*
-      GetDownloadManagerDelegate() OVERRIDE;
-  virtual content::BrowserPluginGuestManager* GetGuestManager() OVERRIDE;
-  virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
-  virtual content::PushMessagingService* GetPushMessagingService() OVERRIDE;
-  virtual content::SSLHostStateDelegate* GetSSLHostStateDelegate() OVERRIDE;
-
-  // visitedlink::VisitedLinkDelegate implementation.
-  virtual void RebuildTable(
-      const scoped_refptr<URLEnumerator>& enumerator) OVERRIDE;
-
- private:
-  static bool data_reduction_proxy_enabled_;
-
-  // The file path where data for this context is persisted.
-  base::FilePath context_storage_path_;
-
-  JniDependencyFactory* native_factory_;
-  scoped_refptr<net::CookieStore> cookie_store_;
-  scoped_refptr<AwURLRequestContextGetter> url_request_context_getter_;
-  scoped_refptr<AwQuotaManagerBridge> quota_manager_bridge_;
-  scoped_ptr<AwFormDatabaseService> form_database_service_;
-
-  AwDownloadManagerDelegate download_manager_delegate_;
-
-  scoped_ptr<visitedlink::VisitedLinkMaster> visitedlink_master_;
-  scoped_ptr<content::ResourceContext> resource_context_;
-
-  scoped_ptr<PrefService> user_pref_service_;
-
-  scoped_ptr<data_reduction_proxy::DataReductionProxyConfigurator>
-      data_reduction_proxy_configurator_;
-  scoped_ptr<data_reduction_proxy::DataReductionProxySettings>
-      data_reduction_proxy_settings_;
-
-  DISALLOW_COPY_AND_ASSIGN(AwBrowserContext);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_BROWSER_CONTEXT_H_
diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc
deleted file mode 100644
index c5b66fe..0000000
--- a/android_webview/browser/aw_browser_main_parts.cc
+++ /dev/null
@@ -1,120 +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.
-
-#include "android_webview/browser/aw_browser_main_parts.h"
-
-#include "android_webview/browser/aw_browser_context.h"
-#include "android_webview/browser/aw_result_codes.h"
-#include "android_webview/native/aw_assets.h"
-#include "base/android/build_info.h"
-#include "base/android/memory_pressure_listener_android.h"
-#include "base/command_line.h"
-#include "base/files/file_path.h"
-#include "base/path_service.h"
-#include "content/public/browser/render_process_host.h"
-#include "content/public/common/content_client.h"
-#include "content/public/common/content_switches.h"
-#include "content/public/common/result_codes.h"
-#include "content/public/common/url_utils.h"
-#include "gpu/command_buffer/service/mailbox_synchronizer.h"
-#include "net/android/network_change_notifier_factory_android.h"
-#include "net/base/network_change_notifier.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/l10n/l10n_util_android.h"
-#include "ui/base/layout.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_base_paths.h"
-
-namespace android_webview {
-
-AwBrowserMainParts::AwBrowserMainParts(AwBrowserContext* browser_context)
-    : browser_context_(browser_context) {
-}
-
-AwBrowserMainParts::~AwBrowserMainParts() {
-}
-
-void AwBrowserMainParts::PreEarlyInitialization() {
-  net::NetworkChangeNotifier::SetFactory(
-      new net::NetworkChangeNotifierFactoryAndroid());
-
-  // Android WebView does not use default MessageLoop. It has its own
-  // Android specific MessageLoop. Also see MainMessageLoopRun.
-  DCHECK(!main_message_loop_.get());
-  main_message_loop_.reset(new base::MessageLoopForUI);
-  base::MessageLoopForUI::current()->Start();
-}
-
-int AwBrowserMainParts::PreCreateThreads() {
-  int pak_fd = 0;
-  int64 pak_off = 0;
-  int64 pak_len = 0;
-
-  // TODO(primiano, mkosiba): GetApplicationLocale requires a ResourceBundle
-  // instance to be present to work correctly so we call this (knowing it will
-  // fail) just to create the ResourceBundle instance. We should refactor
-  // ResourceBundle/GetApplicationLocale to not require an instance to be
-  // initialized.
-  ui::ResourceBundle::InitSharedInstanceWithLocale(
-      l10n_util::GetDefaultLocale(),
-      NULL,
-      ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
-  std::string locale = l10n_util::GetApplicationLocale(std::string()) + ".pak";
-  if (AwAssets::OpenAsset(locale, &pak_fd, &pak_off, &pak_len)) {
-    VLOG(0) << "Load from apk succesful, fd=" << pak_fd << " off=" << pak_off
-            << " len=" << pak_len;
-    ui::ResourceBundle::CleanupSharedInstance();
-    ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
-        base::File(pak_fd), base::MemoryMappedFile::Region(pak_off, pak_len));
-  } else {
-    LOG(WARNING) << "Failed to load " << locale << ".pak from the apk too. "
-                    "Bringing up WebView without any locale";
-  }
-
-  // Try to directly mmap the webviewchromium.pak from the apk. Fall back to
-  // load from file, using PATH_SERVICE, otherwise.
-  if (AwAssets::OpenAsset("webviewchromium.pak", &pak_fd, &pak_off, &pak_len)) {
-    VLOG(0) << "Loading webviewchromium.pak from, fd:" << pak_fd
-            << " off:" << pak_off << " len:" << pak_len;
-    ui::ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
-        base::File(pak_fd),
-        base::MemoryMappedFile::Region(pak_off, pak_len),
-        ui::SCALE_FACTOR_NONE);
-  } else {
-    base::FilePath pak_path;
-    PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path);
-    LOG(WARNING) << "Cannot load webviewchromium.pak assets from the apk. "
-                    "Falling back loading it from " << pak_path.MaybeAsASCII();
-    ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
-        pak_path.AppendASCII("webviewchromium.pak"), ui::SCALE_FACTOR_NONE);
-  }
-
-  base::android::MemoryPressureListenerAndroid::RegisterSystemCallback(
-      base::android::AttachCurrentThread());
-
-  return content::RESULT_CODE_NORMAL_EXIT;
-}
-
-void AwBrowserMainParts::PreMainMessageLoopRun() {
-  // TODO(boliu): Can't support accelerated 2d canvas and WebGL with ubercomp
-  // yet: crbug.com/352424.
-  if (!gpu::gles2::MailboxSynchronizer::Initialize()) {
-    CommandLine* cl = CommandLine::ForCurrentProcess();
-    cl->AppendSwitch(switches::kDisableAccelerated2dCanvas);
-    cl->AppendSwitch(switches::kDisableExperimentalWebGL);
-  }
-
-  browser_context_->PreMainMessageLoopRun();
-  // This is needed for WebView Classic backwards compatibility
-  // See crbug.com/298495
-  content::SetMaxURLChars(20 * 1024 * 1024);
-}
-
-bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) {
-  // Android WebView does not use default MessageLoop. It has its own
-  // Android specific MessageLoop.
-  return true;
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_browser_main_parts.h b/android_webview/browser/aw_browser_main_parts.h
deleted file mode 100644
index 8beec92..0000000
--- a/android_webview/browser/aw_browser_main_parts.h
+++ /dev/null
@@ -1,42 +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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_BROWSER_MAIN_PARTS_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_BROWSER_MAIN_PARTS_H_
-
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
-#include "content/public/browser/browser_main_parts.h"
-
-namespace base {
-class MessageLoop;
-}
-
-namespace android_webview {
-
-class AwBrowserContext;
-
-class AwBrowserMainParts : public content::BrowserMainParts {
- public:
-  explicit AwBrowserMainParts(AwBrowserContext* browser_context);
-  virtual ~AwBrowserMainParts();
-
-  // Overriding methods from content::BrowserMainParts.
-  virtual void PreEarlyInitialization() OVERRIDE;
-  virtual int PreCreateThreads() OVERRIDE;
-  virtual void PreMainMessageLoopRun() OVERRIDE;
-  virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
-
- private:
-  // Android specific UI MessageLoop.
-  scoped_ptr<base::MessageLoop> main_message_loop_;
-
-  AwBrowserContext* browser_context_;  // weak
-
-  DISALLOW_COPY_AND_ASSIGN(AwBrowserMainParts);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_BROWSER_MAIN_PARTS_H_
diff --git a/android_webview/browser/aw_browser_permission_request_delegate.h b/android_webview/browser/aw_browser_permission_request_delegate.h
deleted file mode 100644
index 501ea90..0000000
--- a/android_webview/browser/aw_browser_permission_request_delegate.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_BROWSER_PERMISSION_REQUEST_DELEGATE_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_BROWSER_PERMISSION_REQUEST_DELEGATE_H_
-
-#include "base/callback_forward.h"
-#include "url/gurl.h"
-
-namespace android_webview {
-
-// Delegate interface to handle the permission requests from |BrowserContext|.
-class AwBrowserPermissionRequestDelegate {
- public:
-  // Returns the AwBrowserPermissionRequestDelegate instance associated with
-  // the given render_process_id and render_view_id, or NULL.
-  static AwBrowserPermissionRequestDelegate* FromID(int render_process_id,
-                                                    int render_view_id);
-
-  virtual void RequestProtectedMediaIdentifierPermission(
-      const GURL& origin,
-      const base::Callback<void(bool)>& callback) = 0;
-
-  virtual void CancelProtectedMediaIdentifierPermissionRequests(
-      const GURL& origin) = 0;
-
-  virtual void RequestGeolocationPermission(
-      const GURL& origin,
-      const base::Callback<void(bool)>& callback) = 0;
-
-  virtual void CancelGeolocationPermissionRequests(const GURL& origin) = 0;
-
- protected:
-  AwBrowserPermissionRequestDelegate() {}
-};
-
-}  // namespace android_webview
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_BROWSER_PERMISSION_REQUEST_DELEGATE_H_
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
deleted file mode 100644
index 4b1ee6f..0000000
--- a/android_webview/browser/aw_content_browser_client.cc
+++ /dev/null
@@ -1,583 +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.
-
-#include "android_webview/browser/aw_content_browser_client.h"
-
-#include "android_webview/browser/aw_browser_context.h"
-#include "android_webview/browser/aw_browser_main_parts.h"
-#include "android_webview/browser/aw_browser_permission_request_delegate.h"
-#include "android_webview/browser/aw_contents_client_bridge_base.h"
-#include "android_webview/browser/aw_contents_io_thread_client.h"
-#include "android_webview/browser/aw_cookie_access_policy.h"
-#include "android_webview/browser/aw_quota_permission_context.h"
-#include "android_webview/browser/aw_web_preferences_populater.h"
-#include "android_webview/browser/jni_dependency_factory.h"
-#include "android_webview/browser/net/aw_url_request_context_getter.h"
-#include "android_webview/browser/net_disk_cache_remover.h"
-#include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
-#include "android_webview/common/render_view_messages.h"
-#include "android_webview/common/url_constants.h"
-#include "base/base_paths_android.h"
-#include "base/path_service.h"
-#include "components/cdm/browser/cdm_message_filter_android.h"
-#include "content/public/browser/access_token_store.h"
-#include "content/public/browser/browser_message_filter.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/child_process_security_policy.h"
-#include "content/public/browser/render_process_host.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/common/url_constants.h"
-#include "content/public/common/web_preferences.h"
-#include "net/android/network_library.h"
-#include "net/ssl/ssl_cert_request_info.h"
-#include "net/ssl/ssl_info.h"
-#include "ui/base/l10n/l10n_util_android.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/resources/grit/ui_resources.h"
-
-using content::BrowserThread;
-using content::ResourceType;
-
-namespace android_webview {
-namespace {
-
-// TODO(sgurun) move this to its own file.
-// This class filters out incoming aw_contents related IPC messages for the
-// renderer process on the IPC thread.
-class AwContentsMessageFilter : public content::BrowserMessageFilter {
-public:
-  explicit AwContentsMessageFilter(int process_id);
-
-  // BrowserMessageFilter methods.
-  virtual void OverrideThreadForMessage(
-      const IPC::Message& message,
-      BrowserThread::ID* thread) OVERRIDE;
-  virtual bool OnMessageReceived(
-      const IPC::Message& message) OVERRIDE;
-
-  void OnShouldOverrideUrlLoading(int routing_id,
-                                  const base::string16& url,
-                                  bool* ignore_navigation);
-  void OnSubFrameCreated(int parent_render_frame_id, int child_render_frame_id);
-
-private:
-  virtual ~AwContentsMessageFilter();
-
-  int process_id_;
-
-  DISALLOW_COPY_AND_ASSIGN(AwContentsMessageFilter);
-};
-
-AwContentsMessageFilter::AwContentsMessageFilter(int process_id)
-    : BrowserMessageFilter(AndroidWebViewMsgStart),
-      process_id_(process_id) {
-}
-
-AwContentsMessageFilter::~AwContentsMessageFilter() {
-}
-
-void AwContentsMessageFilter::OverrideThreadForMessage(
-    const IPC::Message& message, BrowserThread::ID* thread) {
-  if (message.type() == AwViewHostMsg_ShouldOverrideUrlLoading::ID) {
-    *thread = BrowserThread::UI;
-  }
-}
-
-bool AwContentsMessageFilter::OnMessageReceived(const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(AwContentsMessageFilter, message)
-    IPC_MESSAGE_HANDLER(AwViewHostMsg_ShouldOverrideUrlLoading,
-                        OnShouldOverrideUrlLoading)
-    IPC_MESSAGE_HANDLER(AwViewHostMsg_SubFrameCreated, OnSubFrameCreated)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
-void AwContentsMessageFilter::OnShouldOverrideUrlLoading(
-    int render_frame_id,
-    const base::string16& url,
-    bool* ignore_navigation) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  *ignore_navigation = false;
-  AwContentsClientBridgeBase* client =
-      AwContentsClientBridgeBase::FromID(process_id_, render_frame_id);
-  if (client) {
-    *ignore_navigation = client->ShouldOverrideUrlLoading(url);
-  } else {
-    LOG(WARNING) << "Failed to find the associated render view host for url: "
-                 << url;
-  }
-}
-
-void AwContentsMessageFilter::OnSubFrameCreated(int parent_render_frame_id,
-                                                int child_render_frame_id) {
-  AwContentsIoThreadClient::SubFrameCreated(
-      process_id_, parent_render_frame_id, child_render_frame_id);
-}
-
-class AwAccessTokenStore : public content::AccessTokenStore {
- public:
-  AwAccessTokenStore() { }
-
-  // content::AccessTokenStore implementation
-  virtual void LoadAccessTokens(
-      const LoadAccessTokensCallbackType& request) OVERRIDE {
-    AccessTokenStore::AccessTokenSet access_token_set;
-    // AccessTokenSet and net::URLRequestContextGetter not used on Android,
-    // but Run needs to be called to finish the geolocation setup.
-    request.Run(access_token_set, NULL);
-  }
-  virtual void SaveAccessToken(const GURL& server_url,
-                               const base::string16& access_token) OVERRIDE { }
-
- private:
-  virtual ~AwAccessTokenStore() { }
-
-  DISALLOW_COPY_AND_ASSIGN(AwAccessTokenStore);
-};
-
-void CancelProtectedMediaIdentifierPermissionRequests(
-    int render_process_id,
-    int render_view_id,
-    const GURL& origin) {
-  AwBrowserPermissionRequestDelegate* delegate =
-      AwBrowserPermissionRequestDelegate::FromID(render_process_id,
-                                                 render_view_id);
-  if (delegate)
-    delegate->CancelProtectedMediaIdentifierPermissionRequests(origin);
-}
-
-void CancelGeolocationPermissionRequests(
-    int render_process_id,
-    int render_view_id,
-    const GURL& origin) {
-  AwBrowserPermissionRequestDelegate* delegate =
-      AwBrowserPermissionRequestDelegate::FromID(render_process_id,
-                                                 render_view_id);
-  if (delegate)
-    delegate->CancelGeolocationPermissionRequests(origin);
-}
-
-}  // namespace
-
-std::string AwContentBrowserClient::GetAcceptLangsImpl() {
-  // Start with the currnet locale.
-  std::string langs = l10n_util::GetDefaultLocale();
-
-  // If we're not en-US, add in en-US which will be
-  // used with a lower q-value.
-  if (base::StringToLowerASCII(langs) != "en-us") {
-    langs += ",en-US";
-  }
-  return langs;
-}
-
-AwBrowserContext* AwContentBrowserClient::GetAwBrowserContext() {
-  return AwBrowserContext::GetDefault();
-}
-
-AwContentBrowserClient::AwContentBrowserClient(
-    JniDependencyFactory* native_factory)
-    : native_factory_(native_factory) {
-  base::FilePath user_data_dir;
-  if (!PathService::Get(base::DIR_ANDROID_APP_DATA, &user_data_dir)) {
-    NOTREACHED() << "Failed to get app data directory for Android WebView";
-  }
-  browser_context_.reset(
-      new AwBrowserContext(user_data_dir, native_factory_));
-}
-
-AwContentBrowserClient::~AwContentBrowserClient() {
-}
-
-void AwContentBrowserClient::AddCertificate(net::CertificateMimeType cert_type,
-                                            const void* cert_data,
-                                            size_t cert_size,
-                                            int render_process_id,
-                                            int render_frame_id) {
-  if (cert_size > 0)
-    net::android::StoreCertificate(cert_type, cert_data, cert_size);
-}
-
-content::BrowserMainParts* AwContentBrowserClient::CreateBrowserMainParts(
-    const content::MainFunctionParams& parameters) {
-  return new AwBrowserMainParts(browser_context_.get());
-}
-
-content::WebContentsViewDelegate*
-AwContentBrowserClient::GetWebContentsViewDelegate(
-    content::WebContents* web_contents) {
-  return native_factory_->CreateViewDelegate(web_contents);
-}
-
-void AwContentBrowserClient::RenderProcessWillLaunch(
-    content::RenderProcessHost* host) {
-  // If WebView becomes multi-process capable, this may be insecure.
-  // More benefit can be derived from the ChildProcessSecurotyPolicy by
-  // deferring the GrantScheme calls until we know that a given child process
-  // really does need that priviledge. Check here to ensure we rethink this
-  // when the time comes. See crbug.com/156062.
-  CHECK(content::RenderProcessHost::run_renderer_in_process());
-
-  // Grant content: and file: scheme to the whole process, since we impose
-  // per-view access checks.
-  content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme(
-      host->GetID(), android_webview::kContentScheme);
-  content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme(
-      host->GetID(), url::kFileScheme);
-
-  host->AddFilter(new AwContentsMessageFilter(host->GetID()));
-  host->AddFilter(new cdm::CdmMessageFilterAndroid());
-}
-
-net::URLRequestContextGetter* AwContentBrowserClient::CreateRequestContext(
-    content::BrowserContext* browser_context,
-    content::ProtocolHandlerMap* protocol_handlers,
-    content::URLRequestInterceptorScopedVector request_interceptors) {
-  DCHECK_EQ(browser_context_.get(), browser_context);
-  return browser_context_->CreateRequestContext(protocol_handlers,
-                                                request_interceptors.Pass());
-}
-
-net::URLRequestContextGetter*
-AwContentBrowserClient::CreateRequestContextForStoragePartition(
-    content::BrowserContext* browser_context,
-    const base::FilePath& partition_path,
-    bool in_memory,
-    content::ProtocolHandlerMap* protocol_handlers,
-    content::URLRequestInterceptorScopedVector request_interceptors) {
-  DCHECK_EQ(browser_context_.get(), browser_context);
-  // TODO(mkosiba,kinuko): request_interceptors should be hooked up in the
-  // downstream. (crbug.com/350286)
-  return browser_context_->CreateRequestContextForStoragePartition(
-      partition_path, in_memory, protocol_handlers,
-      request_interceptors.Pass());
-}
-
-std::string AwContentBrowserClient::GetCanonicalEncodingNameByAliasName(
-    const std::string& alias_name) {
-  return alias_name;
-}
-
-void AwContentBrowserClient::AppendExtraCommandLineSwitches(
-    base::CommandLine* command_line,
-    int child_process_id) {
-  NOTREACHED() << "Android WebView does not support multi-process yet";
-}
-
-std::string AwContentBrowserClient::GetApplicationLocale() {
-  return l10n_util::GetDefaultLocale();
-}
-
-std::string AwContentBrowserClient::GetAcceptLangs(
-    content::BrowserContext* context) {
-  return GetAcceptLangsImpl();
-}
-
-const gfx::ImageSkia* AwContentBrowserClient::GetDefaultFavicon() {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  // TODO(boliu): Bundle our own default favicon?
-  return rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
-}
-
-bool AwContentBrowserClient::AllowAppCache(const GURL& manifest_url,
-                           const GURL& first_party,
-                           content::ResourceContext* context) {
-  // WebView doesn't have a per-site policy for locally stored data,
-  // instead AppCache can be disabled for individual WebViews.
-  return true;
-}
-
-
-bool AwContentBrowserClient::AllowGetCookie(const GURL& url,
-                                            const GURL& first_party,
-                                            const net::CookieList& cookie_list,
-                                            content::ResourceContext* context,
-                                            int render_process_id,
-                                            int render_frame_id) {
-  return AwCookieAccessPolicy::GetInstance()->AllowGetCookie(url,
-                                                             first_party,
-                                                             cookie_list,
-                                                             context,
-                                                             render_process_id,
-                                                             render_frame_id);
-}
-
-bool AwContentBrowserClient::AllowSetCookie(const GURL& url,
-                                            const GURL& first_party,
-                                            const std::string& cookie_line,
-                                            content::ResourceContext* context,
-                                            int render_process_id,
-                                            int render_frame_id,
-                                            net::CookieOptions* options) {
-  return AwCookieAccessPolicy::GetInstance()->AllowSetCookie(url,
-                                                             first_party,
-                                                             cookie_line,
-                                                             context,
-                                                             render_process_id,
-                                                             render_frame_id,
-                                                             options);
-}
-
-bool AwContentBrowserClient::AllowWorkerDatabase(
-    const GURL& url,
-    const base::string16& name,
-    const base::string16& display_name,
-    unsigned long estimated_size,
-    content::ResourceContext* context,
-    const std::vector<std::pair<int, int> >& render_frames) {
-  // Android WebView does not yet support web workers.
-  return false;
-}
-
-void AwContentBrowserClient::AllowWorkerFileSystem(
-    const GURL& url,
-    content::ResourceContext* context,
-    const std::vector<std::pair<int, int> >& render_frames,
-    base::Callback<void(bool)> callback) {
-  // Android WebView does not yet support web workers.
-  callback.Run(false);
-}
-
-bool AwContentBrowserClient::AllowWorkerIndexedDB(
-    const GURL& url,
-    const base::string16& name,
-    content::ResourceContext* context,
-    const std::vector<std::pair<int, int> >& render_frames) {
-  // Android WebView does not yet support web workers.
-  return false;
-}
-
-content::QuotaPermissionContext*
-AwContentBrowserClient::CreateQuotaPermissionContext() {
-  return new AwQuotaPermissionContext;
-}
-
-void AwContentBrowserClient::AllowCertificateError(
-    int render_process_id,
-    int render_frame_id,
-    int cert_error,
-    const net::SSLInfo& ssl_info,
-    const GURL& request_url,
-    ResourceType resource_type,
-    bool overridable,
-    bool strict_enforcement,
-    bool expired_previous_decision,
-    const base::Callback<void(bool)>& callback,
-    content::CertificateRequestResultType* result) {
-  AwContentsClientBridgeBase* client =
-      AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id);
-  bool cancel_request = true;
-  if (client)
-    client->AllowCertificateError(cert_error,
-                                  ssl_info.cert.get(),
-                                  request_url,
-                                  callback,
-                                  &cancel_request);
-  if (cancel_request)
-    *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY;
-}
-
-void AwContentBrowserClient::SelectClientCertificate(
-      int render_process_id,
-      int render_frame_id,
-      const net::HttpNetworkSession* network_session,
-      net::SSLCertRequestInfo* cert_request_info,
-      const base::Callback<void(net::X509Certificate*)>& callback) {
-  AwContentsClientBridgeBase* client =
-      AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id);
-  if (client) {
-    client->SelectClientCertificate(cert_request_info, callback);
-  } else {
-    callback.Run(NULL);
-  }
-}
-
-blink::WebNotificationPermission
-    AwContentBrowserClient::CheckDesktopNotificationPermission(
-        const GURL& source_url,
-        content::ResourceContext* context,
-        int render_process_id) {
-  // Android WebView does not support notifications, so return Denied here.
-  return blink::WebNotificationPermissionDenied;
-}
-
-void AwContentBrowserClient::ShowDesktopNotification(
-    const content::ShowDesktopNotificationHostMsgParams& params,
-    content::RenderFrameHost* render_frame_host,
-    scoped_ptr<content::DesktopNotificationDelegate> delegate,
-    base::Closure* cancel_callback) {
-  NOTREACHED() << "Android WebView does not support desktop notifications.";
-}
-
-void AwContentBrowserClient::RequestGeolocationPermission(
-    content::WebContents* web_contents,
-    int bridge_id,
-    const GURL& requesting_frame,
-    bool user_gesture,
-    base::Callback<void(bool)> result_callback,
-    base::Closure* cancel_callback) {
-  int render_process_id = web_contents->GetRenderProcessHost()->GetID();
-  int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
-  AwBrowserPermissionRequestDelegate* delegate =
-      AwBrowserPermissionRequestDelegate::FromID(render_process_id,
-                                                 render_view_id);
-  if (delegate == NULL) {
-    DVLOG(0) << "Dropping GeolocationPermission request";
-    result_callback.Run(false);
-    return;
-  }
-
-  GURL origin = requesting_frame.GetOrigin();
-  if (cancel_callback) {
-    *cancel_callback = base::Bind(
-        CancelGeolocationPermissionRequests, render_process_id, render_view_id,
-        origin);
-  }
-  delegate->RequestGeolocationPermission(origin, result_callback);
-}
-
-void AwContentBrowserClient::RequestMidiSysExPermission(
-    content::WebContents* web_contents,
-    int bridge_id,
-    const GURL& requesting_frame,
-    bool user_gesture,
-    base::Callback<void(bool)> result_callback,
-    base::Closure* cancel_callback) {
-  // TODO(toyoshim): Android WebView is not supported yet.
-  // See http://crbug.com/339767.
-  result_callback.Run(false);
-}
-
-void AwContentBrowserClient::RequestProtectedMediaIdentifierPermission(
-    content::WebContents* web_contents,
-    const GURL& origin,
-    base::Callback<void(bool)> result_callback,
-    base::Closure* cancel_callback) {
-  int render_process_id = web_contents->GetRenderProcessHost()->GetID();
-  int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
-  AwBrowserPermissionRequestDelegate* delegate =
-      AwBrowserPermissionRequestDelegate::FromID(render_process_id,
-                                                 render_view_id);
-  if (delegate == NULL) {
-    DVLOG(0) << "Dropping ProtectedMediaIdentifierPermission request";
-    result_callback.Run(false);
-    return;
-  }
-
-  if (cancel_callback) {
-    *cancel_callback = base::Bind(
-        CancelProtectedMediaIdentifierPermissionRequests,
-        render_process_id, render_view_id, origin);
-  }
-  delegate->RequestProtectedMediaIdentifierPermission(origin, result_callback);
-}
-
-bool AwContentBrowserClient::CanCreateWindow(
-    const GURL& opener_url,
-    const GURL& opener_top_level_frame_url,
-    const GURL& source_origin,
-    WindowContainerType container_type,
-    const GURL& target_url,
-    const content::Referrer& referrer,
-    WindowOpenDisposition disposition,
-    const blink::WebWindowFeatures& features,
-    bool user_gesture,
-    bool opener_suppressed,
-    content::ResourceContext* context,
-    int render_process_id,
-    int opener_id,
-    bool* no_javascript_access) {
-  // We unconditionally allow popup windows at this stage and will give
-  // the embedder the opporunity to handle displaying of the popup in
-  // WebContentsDelegate::AddContents (via the
-  // AwContentsClient.onCreateWindow callback).
-  // Note that if the embedder has blocked support for creating popup
-  // windows through AwSettings, then we won't get to this point as
-  // the popup creation will have been blocked at the WebKit level.
-  if (no_javascript_access) {
-    *no_javascript_access = false;
-  }
-  return true;
-}
-
-void AwContentBrowserClient::ResourceDispatcherHostCreated() {
-  AwResourceDispatcherHostDelegate::ResourceDispatcherHostCreated();
-}
-
-net::NetLog* AwContentBrowserClient::GetNetLog() {
-  return browser_context_->GetAwURLRequestContext()->GetNetLog();
-}
-
-content::AccessTokenStore* AwContentBrowserClient::CreateAccessTokenStore() {
-  return new AwAccessTokenStore();
-}
-
-bool AwContentBrowserClient::IsFastShutdownPossible() {
-  NOTREACHED() << "Android WebView is single process, so IsFastShutdownPossible"
-               << " should never be called";
-  return false;
-}
-
-void AwContentBrowserClient::ClearCache(content::RenderViewHost* rvh) {
-  RemoveHttpDiskCache(rvh->GetProcess()->GetBrowserContext(),
-                      rvh->GetProcess()->GetID());
-}
-
-void AwContentBrowserClient::ClearCookies(content::RenderViewHost* rvh) {
-  // TODO(boliu): Implement.
-  NOTIMPLEMENTED();
-}
-
-base::FilePath AwContentBrowserClient::GetDefaultDownloadDirectory() {
-  // Android WebView does not currently use the Chromium downloads system.
-  // Download requests are cancelled immedately when recognized; see
-  // AwResourceDispatcherHost::CreateResourceHandlerForDownload. However the
-  // download system still tries to start up and calls this before recognizing
-  // the request has been cancelled.
-  return base::FilePath();
-}
-
-std::string AwContentBrowserClient::GetDefaultDownloadName() {
-  NOTREACHED() << "Android WebView does not use chromium downloads";
-  return std::string();
-}
-
-void AwContentBrowserClient::DidCreatePpapiPlugin(
-    content::BrowserPpapiHost* browser_host) {
-  NOTREACHED() << "Android WebView does not support plugins";
-}
-
-bool AwContentBrowserClient::AllowPepperSocketAPI(
-    content::BrowserContext* browser_context,
-    const GURL& url,
-    bool private_api,
-    const content::SocketPermissionRequest* params) {
-  NOTREACHED() << "Android WebView does not support plugins";
-  return false;
-}
-
-void AwContentBrowserClient::OverrideWebkitPrefs(
-    content::RenderViewHost* rvh,
-    const GURL& url,
-    content::WebPreferences* web_prefs) {
-  if (!preferences_populater_.get()) {
-    preferences_populater_ = make_scoped_ptr(native_factory_->
-        CreateWebPreferencesPopulater());
-  }
-  preferences_populater_->PopulateFor(
-      content::WebContents::FromRenderViewHost(rvh), web_prefs);
-}
-
-#if defined(VIDEO_HOLE)
-content::ExternalVideoSurfaceContainer*
-AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
-    content::WebContents* web_contents) {
-  return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
-}
-#endif
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h
deleted file mode 100644
index 796c180..0000000
--- a/android_webview/browser/aw_content_browser_client.h
+++ /dev/null
@@ -1,192 +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.
-
-#ifndef ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
-#define ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
-
-#include "android_webview/browser/aw_web_preferences_populater.h"
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
-#include "content/public/browser/content_browser_client.h"
-
-namespace android_webview {
-
-class AwBrowserContext;
-class JniDependencyFactory;
-
-class AwContentBrowserClient : public content::ContentBrowserClient {
- public:
-  // This is what AwContentBrowserClient::GetAcceptLangs uses.
-  static std::string GetAcceptLangsImpl();
-
-  // Deprecated: use AwBrowserContext::GetDefault() instead.
-  static AwBrowserContext* GetAwBrowserContext();
-
-  AwContentBrowserClient(JniDependencyFactory* native_factory);
-  virtual ~AwContentBrowserClient();
-
-  // Overriden methods from ContentBrowserClient.
-  virtual void AddCertificate(net::CertificateMimeType cert_type,
-                              const void* cert_data,
-                              size_t cert_size,
-                              int render_process_id,
-                              int render_frame_id) OVERRIDE;
-  virtual content::BrowserMainParts* CreateBrowserMainParts(
-      const content::MainFunctionParams& parameters) OVERRIDE;
-  virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate(
-      content::WebContents* web_contents) OVERRIDE;
-  virtual void RenderProcessWillLaunch(
-      content::RenderProcessHost* host) OVERRIDE;
-  virtual net::URLRequestContextGetter* CreateRequestContext(
-      content::BrowserContext* browser_context,
-      content::ProtocolHandlerMap* protocol_handlers,
-      content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE;
-  virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
-      content::BrowserContext* browser_context,
-      const base::FilePath& partition_path,
-      bool in_memory,
-      content::ProtocolHandlerMap* protocol_handlers,
-      content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE;
-  virtual std::string GetCanonicalEncodingNameByAliasName(
-      const std::string& alias_name) OVERRIDE;
-  virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
-                                              int child_process_id) OVERRIDE;
-  virtual std::string GetApplicationLocale() OVERRIDE;
-  virtual std::string GetAcceptLangs(content::BrowserContext* context) OVERRIDE;
-  virtual const gfx::ImageSkia* GetDefaultFavicon() OVERRIDE;
-  virtual bool AllowAppCache(const GURL& manifest_url,
-                             const GURL& first_party,
-                             content::ResourceContext* context) OVERRIDE;
-  virtual bool AllowGetCookie(const GURL& url,
-                              const GURL& first_party,
-                              const net::CookieList& cookie_list,
-                              content::ResourceContext* context,
-                              int render_process_id,
-                              int render_frame_id) OVERRIDE;
-  virtual bool AllowSetCookie(const GURL& url,
-                              const GURL& first_party,
-                              const std::string& cookie_line,
-                              content::ResourceContext* context,
-                              int render_process_id,
-                              int render_frame_id,
-                              net::CookieOptions* options) OVERRIDE;
-  virtual bool AllowWorkerDatabase(
-      const GURL& url,
-      const base::string16& name,
-      const base::string16& display_name,
-      unsigned long estimated_size,
-      content::ResourceContext* context,
-      const std::vector<std::pair<int, int> >& render_frames) OVERRIDE;
-  virtual void AllowWorkerFileSystem(
-      const GURL& url,
-      content::ResourceContext* context,
-      const std::vector<std::pair<int, int> >& render_frames,
-      base::Callback<void(bool)> callback) OVERRIDE;
-  virtual bool AllowWorkerIndexedDB(
-      const GURL& url,
-      const base::string16& name,
-      content::ResourceContext* context,
-      const std::vector<std::pair<int, int> >& render_frames) OVERRIDE;
-  virtual content::QuotaPermissionContext*
-      CreateQuotaPermissionContext() OVERRIDE;
-  virtual void AllowCertificateError(
-      int render_process_id,
-      int render_frame_id,
-      int cert_error,
-      const net::SSLInfo& ssl_info,
-      const GURL& request_url,
-      content::ResourceType resource_type,
-      bool overridable,
-      bool strict_enforcement,
-      bool expired_previous_decision,
-      const base::Callback<void(bool)>& callback,
-      content::CertificateRequestResultType* result) OVERRIDE;
-  virtual void SelectClientCertificate(
-      int render_process_id,
-      int render_frame_id,
-      const net::HttpNetworkSession* network_session,
-      net::SSLCertRequestInfo* cert_request_info,
-      const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
-  virtual blink::WebNotificationPermission
-      CheckDesktopNotificationPermission(
-          const GURL& source_url,
-          content::ResourceContext* context,
-          int render_process_id) OVERRIDE;
-  virtual void ShowDesktopNotification(
-      const content::ShowDesktopNotificationHostMsgParams& params,
-      content::RenderFrameHost* render_frame_host,
-      scoped_ptr<content::DesktopNotificationDelegate> delegate,
-      base::Closure* cancel_callback) OVERRIDE;
-  virtual void RequestGeolocationPermission(
-      content::WebContents* web_contents,
-      int bridge_id,
-      const GURL& requesting_frame,
-      bool user_gesture,
-      base::Callback<void(bool)> result_callback,
-      base::Closure* cancel_callback) OVERRIDE;
-  virtual void RequestMidiSysExPermission(
-      content::WebContents* web_contents,
-      int bridge_id,
-      const GURL& requesting_frame,
-      bool user_gesture,
-      base::Callback<void(bool)> result_callback,
-      base::Closure* cancel_callback) OVERRIDE;
-  virtual void RequestProtectedMediaIdentifierPermission(
-    content::WebContents* web_contents,
-    const GURL& origin,
-    base::Callback<void(bool)> result_callback,
-    base::Closure* cancel_callback) OVERRIDE;
-  virtual bool CanCreateWindow(const GURL& opener_url,
-                               const GURL& opener_top_level_frame_url,
-                               const GURL& source_origin,
-                               WindowContainerType container_type,
-                               const GURL& target_url,
-                               const content::Referrer& referrer,
-                               WindowOpenDisposition disposition,
-                               const blink::WebWindowFeatures& features,
-                               bool user_gesture,
-                               bool opener_suppressed,
-                               content::ResourceContext* context,
-                               int render_process_id,
-                               int opener_id,
-                               bool* no_javascript_access) OVERRIDE;
-  virtual void ResourceDispatcherHostCreated() OVERRIDE;
-  virtual net::NetLog* GetNetLog() OVERRIDE;
-  virtual content::AccessTokenStore* CreateAccessTokenStore() OVERRIDE;
-  virtual bool IsFastShutdownPossible() OVERRIDE;
-  virtual void ClearCache(content::RenderViewHost* rvh) OVERRIDE;
-  virtual void ClearCookies(content::RenderViewHost* rvh) OVERRIDE;
-  virtual base::FilePath GetDefaultDownloadDirectory() OVERRIDE;
-  virtual std::string GetDefaultDownloadName() OVERRIDE;
-  virtual void DidCreatePpapiPlugin(
-      content::BrowserPpapiHost* browser_host) OVERRIDE;
-  virtual bool AllowPepperSocketAPI(
-      content::BrowserContext* browser_context,
-      const GURL& url,
-      bool private_api,
-      const content::SocketPermissionRequest* params) OVERRIDE;
-  virtual void OverrideWebkitPrefs(content::RenderViewHost* rvh,
-                                   const GURL& url,
-                                   content::WebPreferences* web_prefs) OVERRIDE;
-#if defined(VIDEO_HOLE)
-  virtual content::ExternalVideoSurfaceContainer*
-      OverrideCreateExternalVideoSurfaceContainer(
-          content::WebContents* web_contents) OVERRIDE;
-#endif
-
- private:
-  // Android WebView currently has a single global (non-off-the-record) browser
-  // context.
-  scoped_ptr<AwBrowserContext> browser_context_;
-  scoped_ptr<AwWebPreferencesPopulater> preferences_populater_;
-
-  JniDependencyFactory* native_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
diff --git a/android_webview/browser/aw_contents_client_bridge_base.cc b/android_webview/browser/aw_contents_client_bridge_base.cc
deleted file mode 100644
index ffd7160f..0000000
--- a/android_webview/browser/aw_contents_client_bridge_base.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) 2013 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.
-
-#include "android_webview/browser/aw_contents_client_bridge_base.h"
-
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/render_frame_host.h"
-#include "content/public/browser/web_contents.h"
-
-using content::BrowserThread;
-using content::WebContents;
-
-namespace android_webview {
-
-namespace {
-
-const void* kAwContentsClientBridgeBase = &kAwContentsClientBridgeBase;
-
-// This class is invented so that the UserData registry that we inject the
-// AwContentsClientBridgeBase object does not own and destroy it.
-class UserData : public base::SupportsUserData::Data {
- public:
-  static AwContentsClientBridgeBase* GetContents(
-      content::WebContents* web_contents) {
-    if (!web_contents)
-      return NULL;
-    UserData* data = reinterpret_cast<UserData*>(
-        web_contents->GetUserData(kAwContentsClientBridgeBase));
-    return data ? data->contents_ : NULL;
-  }
-
-  explicit UserData(AwContentsClientBridgeBase* ptr) : contents_(ptr) {}
- private:
-  AwContentsClientBridgeBase* contents_;
-
-  DISALLOW_COPY_AND_ASSIGN(UserData);
-};
-
-} // namespace
-
-// static
-void AwContentsClientBridgeBase::Associate(
-    WebContents* web_contents,
-    AwContentsClientBridgeBase* handler) {
-  web_contents->SetUserData(kAwContentsClientBridgeBase,
-                            new UserData(handler));
-}
-
-void AwContentsClientBridgeBase::Disassociate(
-  WebContents* web_contents) {
-  web_contents->RemoveUserData(kAwContentsClientBridgeBase);
-}
-
-// static
-AwContentsClientBridgeBase* AwContentsClientBridgeBase::FromWebContents(
-    WebContents* web_contents) {
-  return UserData::GetContents(web_contents);
-}
-
-// static
-AwContentsClientBridgeBase* AwContentsClientBridgeBase::FromID(
-    int render_process_id,
-    int render_frame_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  content::RenderFrameHost* rfh =
-      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
-  content::WebContents* web_contents =
-      content::WebContents::FromRenderFrameHost(rfh);
-  return UserData::GetContents(web_contents);
-}
-
-AwContentsClientBridgeBase::~AwContentsClientBridgeBase() {
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_contents_client_bridge_base.h b/android_webview/browser/aw_contents_client_bridge_base.h
deleted file mode 100644
index 3bc1815..0000000
--- a/android_webview/browser/aw_contents_client_bridge_base.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) 2013 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_
-
-#include "base/callback_forward.h"
-#include "base/supports_user_data.h"
-#include "content/public/browser/javascript_dialog_manager.h"
-
-class GURL;
-
-namespace content {
-class WebContents;
-}
-
-namespace net {
-class SSLCertRequestInfo;
-class X509Certificate;
-}
-
-namespace android_webview {
-
-// browser/ layer interface for AwContensClientBridge, as DEPS prevents this
-// layer from depending on native/ where the implementation lives. The
-// implementor of the base class plumbs the request to the Java side and
-// eventually to the webviewclient. This layering hides the details of
-// native/ from browser/ layer.
-class AwContentsClientBridgeBase {
- public:
-  typedef base::Callback<void(net::X509Certificate*)> SelectCertificateCallback;
-
-  // Adds the handler to the UserData registry.
-  static void Associate(content::WebContents* web_contents,
-                        AwContentsClientBridgeBase* handler);
-  static void Disassociate(content::WebContents* web_contents);
-  static AwContentsClientBridgeBase* FromWebContents(
-      content::WebContents* web_contents);
-  static AwContentsClientBridgeBase* FromID(int render_process_id,
-                                            int render_frame_id);
-
-  virtual ~AwContentsClientBridgeBase();
-
-  virtual void AllowCertificateError(int cert_error,
-                                     net::X509Certificate* cert,
-                                     const GURL& request_url,
-                                     const base::Callback<void(bool)>& callback,
-                                     bool* cancel_request) = 0;
-  virtual void SelectClientCertificate(
-      net::SSLCertRequestInfo* cert_request_info,
-      const SelectCertificateCallback& callback) = 0;
-
-  virtual void RunJavaScriptDialog(
-      content::JavaScriptMessageType message_type,
-      const GURL& origin_url,
-      const base::string16& message_text,
-      const base::string16& default_prompt_text,
-      const content::JavaScriptDialogManager::DialogClosedCallback& callback)
-      = 0;
-
-  virtual void RunBeforeUnloadDialog(
-      const GURL& origin_url,
-      const base::string16& message_text,
-      const content::JavaScriptDialogManager::DialogClosedCallback& callback)
-      = 0;
-
-  virtual bool ShouldOverrideUrlLoading(const base::string16& url) = 0;
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_
diff --git a/android_webview/browser/aw_contents_io_thread_client.h b/android_webview/browser/aw_contents_io_thread_client.h
deleted file mode 100644
index cb8bc26..0000000
--- a/android_webview/browser/aw_contents_io_thread_client.h
+++ /dev/null
@@ -1,109 +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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_IO_THREAD_CLIENT_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_IO_THREAD_CLIENT_H_
-
-#include <string>
-
-#include "base/memory/scoped_ptr.h"
-
-class GURL;
-
-namespace net {
-class URLRequest;
-}
-
-namespace android_webview {
-
-class AwWebResourceResponse;
-
-// This class provides a means of calling Java methods on an instance that has
-// a 1:1 relationship with a WebContents instance directly from the IO thread.
-//
-// Specifically this is used to associate URLRequests with the WebContents that
-// the URLRequest is made for.
-//
-// The native class is intended to be a short-lived handle that pins the
-// Java-side instance. It is preferable to use the static getter methods to
-// obtain a new instance of the class rather than holding on to one for
-// prolonged periods of time (see note for more details).
-//
-// Note: The native AwContentsIoThreadClient instance has a Global ref to
-// the Java object. By keeping the native AwContentsIoThreadClient
-// instance alive you're also prolonging the lifetime of the Java instance, so
-// don't keep a AwContentsIoThreadClient if you don't need to.
-class AwContentsIoThreadClient {
- public:
-  // Corresponds to WebSettings cache mode constants.
-  enum CacheMode {
-    LOAD_DEFAULT = -1,
-    LOAD_NORMAL = 0,
-    LOAD_CACHE_ELSE_NETWORK = 1,
-    LOAD_NO_CACHE = 2,
-    LOAD_CACHE_ONLY = 3,
-  };
-
-  virtual ~AwContentsIoThreadClient() {}
-
-  // Returns whether this is a new pop up that is still waiting for association
-  // with the java counter part.
-  virtual bool PendingAssociation() const = 0;
-
-  // Retrieve CacheMode setting value of this AwContents.
-  // This method is called on the IO thread only.
-  virtual CacheMode GetCacheMode() const = 0;
-
-  // This will attempt to fetch the AwContentsIoThreadClient for the given
-  // |render_process_id|, |render_frame_id| pair.
-  // This method can be called from any thread.
-  // An empty scoped_ptr is a valid return value.
-  static scoped_ptr<AwContentsIoThreadClient> FromID(int render_process_id,
-                                                     int render_frame_id);
-
-  // Called on the IO thread when a subframe is created.
-  static void SubFrameCreated(int render_process_id,
-                              int parent_render_frame_id,
-                              int child_render_frame_id);
-
-  // This method is called on the IO thread only.
-  virtual scoped_ptr<AwWebResourceResponse> ShouldInterceptRequest(
-      const GURL& location,
-      const net::URLRequest* request) = 0;
-
-  // Retrieve the AllowContentAccess setting value of this AwContents.
-  // This method is called on the IO thread only.
-  virtual bool ShouldBlockContentUrls() const = 0;
-
-  // Retrieve the AllowFileAccess setting value of this AwContents.
-  // This method is called on the IO thread only.
-  virtual bool ShouldBlockFileUrls() const = 0;
-
-  // Retrieve the BlockNetworkLoads setting value of this AwContents.
-  // This method is called on the IO thread only.
-  virtual bool ShouldBlockNetworkLoads() const = 0;
-
-  // Retrieve the AcceptThirdPartyCookies setting value of this AwContents.
-  virtual bool ShouldAcceptThirdPartyCookies() const = 0;
-
-  // Called when ResourceDispathcerHost detects a download request.
-  // The download is already cancelled when this is called, since
-  // relevant for DownloadListener is already extracted.
-  virtual void NewDownload(const GURL& url,
-                           const std::string& user_agent,
-                           const std::string& content_disposition,
-                           const std::string& mime_type,
-                           int64 content_length) = 0;
-
-  // Called when a new login request is detected. See the documentation for
-  // WebViewClient.onReceivedLoginRequest for arguments. Note that |account|
-  // may be empty.
-  virtual void NewLoginRequest(const std::string& realm,
-                               const std::string& account,
-                               const std::string& args) = 0;
-};
-
-} // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_IO_THREAD_CLIENT_H_
diff --git a/android_webview/browser/aw_cookie_access_policy.cc b/android_webview/browser/aw_cookie_access_policy.cc
deleted file mode 100644
index 242abca..0000000
--- a/android_webview/browser/aw_cookie_access_policy.cc
+++ /dev/null
@@ -1,145 +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.
-
-#include "android_webview/browser/aw_cookie_access_policy.h"
-
-#include "android_webview/browser/aw_contents_io_thread_client.h"
-
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/resource_request_info.h"
-#include "net/base/net_errors.h"
-
-using base::AutoLock;
-using content::BrowserThread;
-using content::ResourceRequestInfo;
-using net::StaticCookiePolicy;
-
-namespace android_webview {
-
-namespace {
-base::LazyInstance<AwCookieAccessPolicy>::Leaky g_lazy_instance;
-}  // namespace
-
-AwCookieAccessPolicy::~AwCookieAccessPolicy() {
-}
-
-AwCookieAccessPolicy::AwCookieAccessPolicy()
-    : accept_cookies_(true) {
-}
-
-AwCookieAccessPolicy* AwCookieAccessPolicy::GetInstance() {
-  return g_lazy_instance.Pointer();
-}
-
-bool AwCookieAccessPolicy::GetShouldAcceptCookies() {
-  AutoLock lock(lock_);
-  return accept_cookies_;
-}
-
-void AwCookieAccessPolicy::SetShouldAcceptCookies(bool allow) {
-  AutoLock lock(lock_);
-  accept_cookies_ = allow;
-}
-
-bool AwCookieAccessPolicy::GetShouldAcceptThirdPartyCookies(
-    int render_process_id,
-    int render_frame_id) {
-  scoped_ptr<AwContentsIoThreadClient> io_thread_client =
-      AwContentsIoThreadClient::FromID(render_process_id, render_frame_id);
-  if (!io_thread_client) {
-    return false;
-  }
-  return io_thread_client->ShouldAcceptThirdPartyCookies();
-}
-
-bool AwCookieAccessPolicy::GetShouldAcceptThirdPartyCookies(
-    const net::URLRequest& request) {
-  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(&request);
-  if (!info) {
-    return false;
-  }
-  return GetShouldAcceptThirdPartyCookies(info->GetChildID(),
-                                          info->GetRenderFrameID());
-}
-
-bool AwCookieAccessPolicy::OnCanGetCookies(const net::URLRequest& request,
-                                           const net::CookieList& cookie_list) {
-  bool global = GetShouldAcceptCookies();
-  bool thirdParty = GetShouldAcceptThirdPartyCookies(request);
-  return AwStaticCookiePolicy(global, thirdParty)
-      .AllowGet(request.url(), request.first_party_for_cookies());
-}
-
-bool AwCookieAccessPolicy::OnCanSetCookie(const net::URLRequest& request,
-                                          const std::string& cookie_line,
-                                          net::CookieOptions* options) {
-  bool global = GetShouldAcceptCookies();
-  bool thirdParty = GetShouldAcceptThirdPartyCookies(request);
-  return AwStaticCookiePolicy(global, thirdParty)
-      .AllowSet(request.url(), request.first_party_for_cookies());
-}
-
-bool AwCookieAccessPolicy::AllowGetCookie(const GURL& url,
-                                          const GURL& first_party,
-                                          const net::CookieList& cookie_list,
-                                          content::ResourceContext* context,
-                                          int render_process_id,
-                                          int render_frame_id) {
-  bool global = GetShouldAcceptCookies();
-  bool thirdParty =
-      GetShouldAcceptThirdPartyCookies(render_process_id, render_frame_id);
-  return AwStaticCookiePolicy(global, thirdParty).AllowGet(url, first_party);
-}
-
-bool AwCookieAccessPolicy::AllowSetCookie(const GURL& url,
-                                          const GURL& first_party,
-                                          const std::string& cookie_line,
-                                          content::ResourceContext* context,
-                                          int render_process_id,
-                                          int render_frame_id,
-                                          net::CookieOptions* options) {
-  bool global = GetShouldAcceptCookies();
-  bool thirdParty =
-      GetShouldAcceptThirdPartyCookies(render_process_id, render_frame_id);
-  return AwStaticCookiePolicy(global, thirdParty).AllowSet(url, first_party);
-}
-
-AwStaticCookiePolicy::AwStaticCookiePolicy(bool accept_cookies,
-                                           bool accept_third_party_cookies)
-    : accept_cookies_(accept_cookies),
-      accept_third_party_cookies_(accept_third_party_cookies) {
-}
-
-StaticCookiePolicy::Type AwStaticCookiePolicy::GetPolicy(const GURL& url)
-    const {
-  // File URLs are a special case. We want file URLs to be able to set cookies
-  // but (for the purpose of cookies) Chrome considers different file URLs to
-  // come from different origins so we use the 'allow all' cookie policy for
-  // file URLs.
-  bool isFile = url.SchemeIsFile();
-  if (!accept_cookies()) {
-    return StaticCookiePolicy::BLOCK_ALL_COOKIES;
-  }
-  if (accept_third_party_cookies() || isFile) {
-    return StaticCookiePolicy::ALLOW_ALL_COOKIES;
-  }
-  return StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES;
-}
-
-bool AwStaticCookiePolicy::AllowSet(const GURL& url,
-                                    const GURL& first_party) const {
-
-  return StaticCookiePolicy(GetPolicy(url)).CanSetCookie(url, first_party) ==
-         net::OK;
-}
-
-bool AwStaticCookiePolicy::AllowGet(const GURL& url,
-                                    const GURL& first_party) const {
-  return StaticCookiePolicy(GetPolicy(url)).CanGetCookies(url, first_party) ==
-         net::OK;
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_cookie_access_policy.h b/android_webview/browser/aw_cookie_access_policy.h
deleted file mode 100644
index a2de037..0000000
--- a/android_webview/browser/aw_cookie_access_policy.h
+++ /dev/null
@@ -1,112 +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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_COOKIE_ACCESS_POLICY_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_COOKIE_ACCESS_POLICY_H_
-
-#include "base/basictypes.h"
-#include "base/lazy_instance.h"
-#include "base/synchronization/lock.h"
-#include "net/base/static_cookie_policy.h"
-#include "net/cookies/canonical_cookie.h"
-#include "net/url_request/url_request.h"
-
-namespace content {
-class ResourceContext;
-}
-
-namespace net {
-class CookieOptions;
-}
-
-class GURL;
-
-namespace android_webview {
-
-// Manages the cookie access (both setting and getting) policy for WebView.
-// Currently we don't distinguish between sources (i.e. network vs. JavaScript)
-// or between reading vs. writing cookies.
-class AwCookieAccessPolicy {
- public:
-  static AwCookieAccessPolicy* GetInstance();
-
-  // Can we read/write any cookies?
-  bool GetShouldAcceptCookies();
-  void SetShouldAcceptCookies(bool allow);
-
-  // Can we read/write third party cookies?
-  bool GetShouldAcceptThirdPartyCookies(int render_process_id,
-                                        int render_frame_id);
-  bool GetShouldAcceptThirdPartyCookies(const net::URLRequest& request);
-
-  // These are the functions called when operating over cookies from the
-  // network. See NetworkDelegate for further descriptions.
-  bool OnCanGetCookies(const net::URLRequest& request,
-                       const net::CookieList& cookie_list);
-  bool OnCanSetCookie(const net::URLRequest& request,
-                      const std::string& cookie_line,
-                      net::CookieOptions* options);
-
-  // These are the functions called when operating over cookies from the
-  // renderer. See ContentBrowserClient for further descriptions.
-  bool AllowGetCookie(const GURL& url,
-                      const GURL& first_party,
-                      const net::CookieList& cookie_list,
-                      content::ResourceContext* context,
-                      int render_process_id,
-                      int render_frame_id);
-  bool AllowSetCookie(const GURL& url,
-                      const GURL& first_party,
-                      const std::string& cookie_line,
-                      content::ResourceContext* context,
-                      int render_process_id,
-                      int render_frame_id,
-                      net::CookieOptions* options);
-
- private:
-  friend struct base::DefaultLazyInstanceTraits<AwCookieAccessPolicy>;
-
-  AwCookieAccessPolicy();
-  ~AwCookieAccessPolicy();
-  bool accept_cookies_;
-  base::Lock lock_;
-
-  DISALLOW_COPY_AND_ASSIGN(AwCookieAccessPolicy);
-};
-
-class AwStaticCookiePolicy {
- public:
-  AwStaticCookiePolicy(bool allow_global_access,
-                       bool allow_third_party_access);
-
-  bool accept_cookies() const {
-    return accept_cookies_;
-  }
-
-  bool accept_third_party_cookies() const {
-    return accept_third_party_cookies_;
-  }
-
-  bool AllowGet(const GURL& url, const GURL& first_party) const;
-  bool AllowSet(const GURL& url, const GURL& first_party) const;
-
- private:
-  const bool accept_cookies_;
-  const bool accept_third_party_cookies_;
-
-  // We have two bits of state but only three different cases:
-  // If !ShouldAcceptCookies
-  //    then reject all cookies.
-  // If ShouldAcceptCookies and !ShouldAcceptThirdPartyCookies
-  //    then reject third party.
-  // If ShouldAcceptCookies and ShouldAcceptThirdPartyCookies
-  //    then allow all cookies.
-  net::StaticCookiePolicy::Type GetPolicy(const GURL& url) const;
-
-  DISALLOW_COPY_AND_ASSIGN(AwStaticCookiePolicy);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_COOKIE_ACCESS_POLICY_H_
diff --git a/android_webview/browser/aw_download_manager_delegate.cc b/android_webview/browser/aw_download_manager_delegate.cc
deleted file mode 100644
index cf685f7..0000000
--- a/android_webview/browser/aw_download_manager_delegate.cc
+++ /dev/null
@@ -1,49 +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.
-
-#include "android_webview/browser/aw_download_manager_delegate.h"
-
-#include "base/files/file_path.h"
-#include "content/public/browser/download_danger_type.h"
-#include "content/public/browser/download_item.h"
-
-
-namespace android_webview {
-
-AwDownloadManagerDelegate::~AwDownloadManagerDelegate() {}
-
-bool AwDownloadManagerDelegate::DetermineDownloadTarget(
-    content::DownloadItem* item,
-    const content::DownloadTargetCallback& callback) {
-  // Note this cancel is independent of the URLRequest cancel in
-  // AwResourceDispatcherHostDelegate::DownloadStarting. The request
-  // could have already finished by the time DownloadStarting is called.
-  callback.Run(base::FilePath() /* Empty file path for cancel */,
-               content::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
-               content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-               base::FilePath());
-  return true;
-}
-
-bool AwDownloadManagerDelegate::ShouldCompleteDownload(
-    content::DownloadItem* item,
-    const base::Closure& complete_callback) {
-  NOTREACHED();
-  return true;
-}
-
-bool AwDownloadManagerDelegate::ShouldOpenDownload(
-    content::DownloadItem* item,
-    const content::DownloadOpenDelayedCallback& callback) {
-  NOTREACHED();
-  return true;
-}
-
-void AwDownloadManagerDelegate::GetNextId(
-    const content::DownloadIdCallback& callback) {
-  static uint32 next_id = content::DownloadItem::kInvalidId + 1;
-  callback.Run(next_id++);
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_download_manager_delegate.h b/android_webview/browser/aw_download_manager_delegate.h
deleted file mode 100644
index 890308f..0000000
--- a/android_webview/browser/aw_download_manager_delegate.h
+++ /dev/null
@@ -1,33 +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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_DOWNLOAD_MANAGER_DELEGATE_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_DOWNLOAD_MANAGER_DELEGATE_H_
-
-#include "content/public/browser/download_manager_delegate.h"
-
-namespace android_webview {
-
-// Android WebView does not use Chromium downloads, so implement methods here to
-// unconditionally cancel the download.
-class AwDownloadManagerDelegate : public content::DownloadManagerDelegate {
- public:
-  virtual ~AwDownloadManagerDelegate();
-
-  // content::DownloadManagerDelegate implementation.
-  virtual bool DetermineDownloadTarget(
-      content::DownloadItem* item,
-      const content::DownloadTargetCallback& callback) OVERRIDE;
-  virtual bool ShouldCompleteDownload(
-      content::DownloadItem* item,
-      const base::Closure& complete_callback) OVERRIDE;
-  virtual bool ShouldOpenDownload(
-      content::DownloadItem* item,
-      const content::DownloadOpenDelayedCallback& callback) OVERRIDE;
-  virtual void GetNextId(const content::DownloadIdCallback& callback) OVERRIDE;
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_DOWNLOAD_MANAGER_DELEGATE_H_
diff --git a/android_webview/browser/aw_form_database_service.cc b/android_webview/browser/aw_form_database_service.cc
deleted file mode 100644
index 0fab72e..0000000
--- a/android_webview/browser/aw_form_database_service.cc
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) 2013 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.
-
-#include "android_webview/browser/aw_form_database_service.h"
-#include "base/logging.h"
-#include "base/synchronization/waitable_event.h"
-#include "components/autofill/core/browser/webdata/autofill_table.h"
-#include "components/webdata/common/webdata_constants.h"
-#include "content/public/browser/browser_thread.h"
-#include "ui/base/l10n/l10n_util_android.h"
-
-using base::WaitableEvent;
-using content::BrowserThread;
-
-namespace {
-
-// Callback to handle database error. It seems chrome uses this to
-// display an error dialog box only.
-void DatabaseErrorCallback(sql::InitStatus status) {
-  LOG(WARNING) << "initializing autocomplete database failed";
-}
-
-}  // namespace
-
-namespace android_webview {
-
-AwFormDatabaseService::AwFormDatabaseService(const base::FilePath path) {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  web_database_ = new WebDatabaseService(path.Append(kWebDataFilename),
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB));
-  web_database_->AddTable(
-      scoped_ptr<WebDatabaseTable>(new autofill::AutofillTable(
-          l10n_util::GetDefaultLocale())));
-  web_database_->LoadDatabase();
-
-  autofill_data_ = new autofill::AutofillWebDataService(
-      web_database_,
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
-      base::Bind(&DatabaseErrorCallback));
-  autofill_data_->Init();
-}
-
-AwFormDatabaseService::~AwFormDatabaseService() {
-  Shutdown();
-}
-
-void AwFormDatabaseService::Shutdown() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(result_map_.empty());
-  // TODO(sgurun) we don't run into this logic right now,
-  // but if we do, then we need to implement cancellation
-  // of pending queries.
-  autofill_data_->ShutdownOnUIThread();
-  web_database_->ShutdownDatabase();
-}
-
-scoped_refptr<autofill::AutofillWebDataService>
-AwFormDatabaseService::get_autofill_webdata_service() {
-  return autofill_data_;
-}
-
-void AwFormDatabaseService::ClearFormData() {
-  BrowserThread::PostTask(
-      BrowserThread::DB,
-      FROM_HERE,
-      base::Bind(&AwFormDatabaseService::ClearFormDataImpl,
-                 base::Unretained(this)));
-}
-
-void AwFormDatabaseService::ClearFormDataImpl() {
-  base::Time begin;
-  base::Time end = base::Time::Max();
-  autofill_data_->RemoveFormElementsAddedBetween(begin, end);
-  autofill_data_->RemoveAutofillDataModifiedBetween(begin, end);
-}
-
-bool AwFormDatabaseService::HasFormData() {
-  WaitableEvent completion(false, false);
-  bool result = false;
-  BrowserThread::PostTask(
-      BrowserThread::DB,
-      FROM_HERE,
-      base::Bind(&AwFormDatabaseService::HasFormDataImpl,
-                 base::Unretained(this),
-                 &completion,
-                 &result));
-  completion.Wait();
-  return result;
-}
-
-void AwFormDatabaseService::HasFormDataImpl(
-    WaitableEvent* completion,
-    bool* result) {
-  WebDataServiceBase::Handle pending_query_handle =
-      autofill_data_->HasFormElements(this);
-  PendingQuery query;
-  query.result = result;
-  query.completion = completion;
-  result_map_[pending_query_handle] = query;
-}
-
-void AwFormDatabaseService::OnWebDataServiceRequestDone(
-    WebDataServiceBase::Handle h,
-    const WDTypedResult* result) {
-
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  bool has_form_data = false;
-  if (result) {
-    DCHECK_EQ(AUTOFILL_VALUE_RESULT, result->GetType());
-    const WDResult<bool>* autofill_result =
-        static_cast<const WDResult<bool>*>(result);
-    has_form_data = autofill_result->GetValue();
-  }
-  QueryMap::const_iterator it = result_map_.find(h);
-  if (it == result_map_.end()) {
-    LOG(WARNING) << "Received unexpected callback from web data service";
-    return;
-  }
-  *(it->second.result) = has_form_data;
-  it->second.completion->Signal();
-  result_map_.erase(h);
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_form_database_service.h b/android_webview/browser/aw_form_database_service.h
deleted file mode 100644
index d0b7b485..0000000
--- a/android_webview/browser/aw_form_database_service.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) 2013 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_FORM_DATABASE_SERVICE_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_FORM_DATABASE_SERVICE_H_
-
-#include "base/basictypes.h"
-#include "base/files/file_path.h"
-#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
-#include "components/webdata/common/web_data_service_consumer.h"
-#include "components/webdata/common/web_database_service.h"
-
-namespace base {
-class WaitableEvent;
-};
-
-namespace android_webview {
-
-// Handles the database operations necessary to implement the autocomplete
-// functionality. This includes creating and initializing the components that
-// handle the database backend, and providing a synchronous interface when
-// needed (the chromium database components have an async. interface).
-class AwFormDatabaseService : public WebDataServiceConsumer {
- public:
-  AwFormDatabaseService(const base::FilePath path);
-
-  virtual ~AwFormDatabaseService();
-
-  void Shutdown();
-
-  // Returns whether the database has any data stored. May do
-  // IO access and block.
-  bool HasFormData();
-
-  // Clear any saved form data. Executes asynchronously.
-  void ClearFormData();
-
-  scoped_refptr<autofill::AutofillWebDataService>
-      get_autofill_webdata_service();
-
-  // WebDataServiceConsumer implementation.
-  virtual void OnWebDataServiceRequestDone(
-      WebDataServiceBase::Handle h,
-      const WDTypedResult* result) OVERRIDE;
-
- private:
-  struct PendingQuery {
-    bool* result;
-    base::WaitableEvent* completion;
-  };
-  typedef std::map<WebDataServiceBase::Handle, PendingQuery> QueryMap;
-
-  void ClearFormDataImpl();
-  void HasFormDataImpl(base::WaitableEvent* completion, bool* result);
-
-  QueryMap result_map_;
-
-  scoped_refptr<autofill::AutofillWebDataService> autofill_data_;
-  scoped_refptr<WebDatabaseService> web_database_;
-
-  DISALLOW_COPY_AND_ASSIGN(AwFormDatabaseService);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_FORM_DATABASE_SERVICE_H_
diff --git a/android_webview/browser/aw_form_database_service_unittest.cc b/android_webview/browser/aw_form_database_service_unittest.cc
deleted file mode 100644
index 9750fc8..0000000
--- a/android_webview/browser/aw_form_database_service_unittest.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) 2013 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.
-
-#include <vector>
-
-#include "android_webview/browser/aw_form_database_service.h"
-#include "base/android/jni_android.h"
-#include "base/files/scoped_temp_dir.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
-#include "base/strings/utf_string_conversions.h"
-#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
-#include "components/autofill/core/common/form_field_data.h"
-#include "content/public/test/test_browser_thread.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/l10n/l10n_util_android.h"
-
-using autofill::AutofillWebDataService;
-using autofill::FormFieldData;
-using base::android::AttachCurrentThread;
-using content::BrowserThread;
-using testing::Test;
-
-namespace android_webview {
-
-class AwFormDatabaseServiceTest : public Test {
- public:
-  AwFormDatabaseServiceTest()
-      : ui_thread_(BrowserThread::UI, &message_loop_),
-        db_thread_(BrowserThread::DB) {
-    db_thread_.Start();
-  }
-
- protected:
-  virtual void SetUp() {
-    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-    env_ = AttachCurrentThread();
-    ASSERT_TRUE(env_ != NULL);
-    ASSERT_TRUE(l10n_util::RegisterLocalizationUtil(env_));
-
-    service_.reset(new AwFormDatabaseService(temp_dir_.path()));
-  }
-
-  virtual void TearDown() {
-    service_->Shutdown();
-  }
-
-  // The path to the temporary directory used for the test operations.
-  base::ScopedTempDir temp_dir_;
-  // A message loop for UI thread.
-  base::MessageLoop message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread db_thread_;
-  JNIEnv* env_;
-
-  scoped_ptr<AwFormDatabaseService> service_;
-};
-
-// Disabling this test until we know why it crashes.
-// TODO(sgurun): See http://crbug.com/287726 for details.
-TEST_F(AwFormDatabaseServiceTest, DISABLED_HasAndClearFormData) {
-  EXPECT_FALSE(service_->HasFormData());
-  std::vector<FormFieldData> fields;
-  FormFieldData field;
-  field.name = base::ASCIIToUTF16("foo");
-  field.value = base::ASCIIToUTF16("bar");
-  fields.push_back(field);
-  service_->get_autofill_webdata_service()->AddFormFields(fields);
-  EXPECT_TRUE(service_->HasFormData());
-  service_->ClearFormData();
-  EXPECT_FALSE(service_->HasFormData());
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_gl_surface.cc b/android_webview/browser/aw_gl_surface.cc
deleted file mode 100644
index 5ff9272..0000000
--- a/android_webview/browser/aw_gl_surface.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2013 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.
-
-#include "android_webview/browser/aw_gl_surface.h"
-
-namespace android_webview {
-
-AwGLSurface::AwGLSurface() : fbo_(0) {}
-
-AwGLSurface::~AwGLSurface() {}
-
-void AwGLSurface::Destroy() {
-}
-
-bool AwGLSurface::IsOffscreen() {
-  return false;
-}
-
-unsigned int AwGLSurface::GetBackingFrameBufferObject() {
-  return fbo_;
-}
-
-bool AwGLSurface::SwapBuffers() {
-  return true;
-}
-
-gfx::Size AwGLSurface::GetSize() {
-  return gfx::Size(1, 1);
-}
-
-void* AwGLSurface::GetHandle() {
-  return NULL;
-}
-
-void* AwGLSurface::GetDisplay() {
-  return NULL;
-}
-
-void AwGLSurface::SetBackingFrameBufferObject(unsigned int fbo) {
-  fbo_ = fbo;
-}
-
-void AwGLSurface::ResetBackingFrameBufferObject() {
-  fbo_ = 0;
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_gl_surface.h b/android_webview/browser/aw_gl_surface.h
deleted file mode 100644
index 99b8a1d..0000000
--- a/android_webview/browser/aw_gl_surface.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2013 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_GL_SURFACE_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_GL_SURFACE_H_
-
-#include "ui/gl/gl_surface.h"
-
-namespace android_webview {
-
-// This surface is used to represent the underlying surface provided by the App
-// inside a hardware draw. Note that offscreen contexts will not be using this
-// GLSurface.
-class GL_EXPORT AwGLSurface : public gfx::GLSurface {
- public:
-  AwGLSurface();
-
-  // Implement GLSurface.
-  virtual void Destroy() OVERRIDE;
-  virtual bool IsOffscreen() OVERRIDE;
-  virtual unsigned int GetBackingFrameBufferObject() OVERRIDE;
-  virtual bool SwapBuffers() OVERRIDE;
-  virtual gfx::Size GetSize() OVERRIDE;
-  virtual void* GetHandle() OVERRIDE;
-  virtual void* GetDisplay() OVERRIDE;
-
-  void SetBackingFrameBufferObject(unsigned int fbo);
-  void ResetBackingFrameBufferObject();
-
- protected:
-  virtual ~AwGLSurface();
-
- private:
-  unsigned int fbo_;
-
-  DISALLOW_COPY_AND_ASSIGN(AwGLSurface);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_GL_SURFACE_H_
diff --git a/android_webview/browser/aw_http_auth_handler_base.cc b/android_webview/browser/aw_http_auth_handler_base.cc
deleted file mode 100644
index 0fd5419..0000000
--- a/android_webview/browser/aw_http_auth_handler_base.cc
+++ /dev/null
@@ -1,12 +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.
-
-#include "android_webview/browser/aw_http_auth_handler_base.h"
-
-namespace android_webview {
-
-AwHttpAuthHandlerBase::~AwHttpAuthHandlerBase() {
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_http_auth_handler_base.h b/android_webview/browser/aw_http_auth_handler_base.h
deleted file mode 100644
index e72003b..0000000
--- a/android_webview/browser/aw_http_auth_handler_base.h
+++ /dev/null
@@ -1,37 +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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_HTTP_AUTH_HANDLER_BASE_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_HTTP_AUTH_HANDLER_BASE_H_
-
-namespace content {
-class WebContents;
-};
-
-namespace net {
-class AuthChallengeInfo;
-};
-
-namespace android_webview {
-
-class AwLoginDelegate;
-
-// browser/ layer interface for AwHttpAuthHandler (which is implemented in the
-// native/ layer as a native version of the Java class of the same name). This
-// allows the browser/ layer to be unaware of JNI/Java shenanigans.
-class AwHttpAuthHandlerBase {
- public:
-  static AwHttpAuthHandlerBase* Create(AwLoginDelegate* login_delegate,
-                                       net::AuthChallengeInfo* auth_info,
-                                       bool first_auth_attempt);
-  virtual ~AwHttpAuthHandlerBase();
-
-  // Provides an 'escape-hatch' out to Java for the browser/ layer
-  // AwLoginDelegate.
-  virtual bool HandleOnUIThread(content::WebContents*) = 0;
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_HTTP_AUTH_HANDLER_BASE_H_
diff --git a/android_webview/browser/aw_javascript_dialog_manager.cc b/android_webview/browser/aw_javascript_dialog_manager.cc
deleted file mode 100644
index 476935a..0000000
--- a/android_webview/browser/aw_javascript_dialog_manager.cc
+++ /dev/null
@@ -1,65 +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.
-
-#include "android_webview/browser/aw_javascript_dialog_manager.h"
-
-#include "android_webview/browser/aw_contents_client_bridge_base.h"
-#include "content/public/browser/javascript_dialog_manager.h"
-#include "content/public/browser/web_contents.h"
-
-namespace android_webview {
-
-AwJavaScriptDialogManager::AwJavaScriptDialogManager() {}
-
-AwJavaScriptDialogManager::~AwJavaScriptDialogManager() {}
-
-void AwJavaScriptDialogManager::RunJavaScriptDialog(
-    content::WebContents* web_contents,
-    const GURL& origin_url,
-    const std::string& accept_lang,
-    content::JavaScriptMessageType message_type,
-    const base::string16& message_text,
-    const base::string16& default_prompt_text,
-    const DialogClosedCallback& callback,
-    bool* did_suppress_message) {
-  AwContentsClientBridgeBase* bridge =
-      AwContentsClientBridgeBase::FromWebContents(web_contents);
-  if (!bridge) {
-    callback.Run(false, base::string16());
-    return;
-  }
-
-  bridge->RunJavaScriptDialog(message_type,
-                              origin_url,
-                              message_text,
-                              default_prompt_text,
-                              callback);
-}
-
-void AwJavaScriptDialogManager::RunBeforeUnloadDialog(
-    content::WebContents* web_contents,
-    const base::string16& message_text,
-    bool is_reload,
-    const DialogClosedCallback& callback) {
-  AwContentsClientBridgeBase* bridge =
-      AwContentsClientBridgeBase::FromWebContents(web_contents);
-  if (!bridge) {
-    callback.Run(false, base::string16());
-    return;
-  }
-
-  bridge->RunBeforeUnloadDialog(web_contents->GetURL(),
-                                message_text,
-                                callback);
-}
-
-void AwJavaScriptDialogManager::CancelActiveAndPendingDialogs(
-    content::WebContents* web_contents) {
-}
-
-void AwJavaScriptDialogManager::WebContentsDestroyed(
-    content::WebContents* web_contents) {
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_javascript_dialog_manager.h b/android_webview/browser/aw_javascript_dialog_manager.h
deleted file mode 100644
index e43932d..0000000
--- a/android_webview/browser/aw_javascript_dialog_manager.h
+++ /dev/null
@@ -1,43 +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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_JAVASCRIPT_DIALOG_MANAGER_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_JAVASCRIPT_DIALOG_MANAGER_H_
-
-#include "content/public/browser/javascript_dialog_manager.h"
-
-namespace android_webview {
-
-class AwJavaScriptDialogManager : public content::JavaScriptDialogManager {
- public:
-  explicit AwJavaScriptDialogManager();
-  virtual ~AwJavaScriptDialogManager();
-
-  // Overridden from content::JavaScriptDialogManager:
-  virtual void RunJavaScriptDialog(
-      content::WebContents* web_contents,
-      const GURL& origin_url,
-      const std::string& accept_lang,
-      content::JavaScriptMessageType message_type,
-      const base::string16& message_text,
-      const base::string16& default_prompt_text,
-      const DialogClosedCallback& callback,
-      bool* did_suppress_message) OVERRIDE;
-  virtual void RunBeforeUnloadDialog(
-      content::WebContents* web_contents,
-      const base::string16& message_text,
-      bool is_reload,
-      const DialogClosedCallback& callback) OVERRIDE;
-  virtual void CancelActiveAndPendingDialogs(
-      content::WebContents* web_contents) OVERRIDE;
-  virtual void WebContentsDestroyed(
-      content::WebContents* web_contents) OVERRIDE;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(AwJavaScriptDialogManager);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_JAVASCRIPT_DIALOG_MANAGER_H_
diff --git a/android_webview/browser/aw_login_delegate.cc b/android_webview/browser/aw_login_delegate.cc
deleted file mode 100644
index d388790..0000000
--- a/android_webview/browser/aw_login_delegate.cc
+++ /dev/null
@@ -1,137 +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.
-
-#include "android_webview/browser/aw_login_delegate.h"
-
-#include "android_webview/browser/aw_browser_context.h"
-#include "base/android/jni_android.h"
-#include "base/logging.h"
-#include "base/supports_user_data.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/render_frame_host.h"
-#include "content/public/browser/resource_dispatcher_host.h"
-#include "content/public/browser/resource_request_info.h"
-#include "content/public/browser/web_contents.h"
-#include "net/base/auth.h"
-#include "net/url_request/url_request.h"
-
-using namespace base::android;
-
-using content::BrowserThread;
-using content::RenderFrameHost;
-using content::ResourceDispatcherHost;
-using content::ResourceRequestInfo;
-using content::WebContents;
-
-namespace {
-const char* kAuthAttemptsKey = "android_webview_auth_attempts";
-
-class UrlRequestAuthAttemptsData : public base::SupportsUserData::Data {
- public:
-  UrlRequestAuthAttemptsData() : auth_attempts_(0) { }
-  int auth_attempts_;
-};
-
-}  // namespace
-
-namespace android_webview {
-
-AwLoginDelegate::AwLoginDelegate(net::AuthChallengeInfo* auth_info,
-                                 net::URLRequest* request)
-    : auth_info_(auth_info),
-      request_(request),
-      render_process_id_(0),
-      render_frame_id_(0) {
-    ResourceRequestInfo::GetRenderFrameForRequest(
-        request, &render_process_id_, &render_frame_id_);
-
-    UrlRequestAuthAttemptsData* count =
-        static_cast<UrlRequestAuthAttemptsData*>(
-            request->GetUserData(kAuthAttemptsKey));
-
-    if (count == NULL) {
-      count = new UrlRequestAuthAttemptsData();
-      request->SetUserData(kAuthAttemptsKey, count);
-    }
-
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(&AwLoginDelegate::HandleHttpAuthRequestOnUIThread,
-                   this, (count->auth_attempts_ == 0)));
-    count->auth_attempts_++;
-}
-
-AwLoginDelegate::~AwLoginDelegate() {
-  // The Auth handler holds a ref count back on |this| object, so it should be
-  // impossible to reach here while this object still owns an auth handler.
-  DCHECK(!aw_http_auth_handler_);
-}
-
-void AwLoginDelegate::Proceed(const base::string16& user,
-                              const base::string16& password) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-      base::Bind(&AwLoginDelegate::ProceedOnIOThread,
-                 this, user, password));
-}
-
-void AwLoginDelegate::Cancel() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-      base::Bind(&AwLoginDelegate::CancelOnIOThread, this));
-}
-
-void AwLoginDelegate::HandleHttpAuthRequestOnUIThread(
-    bool first_auth_attempt) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  aw_http_auth_handler_.reset(AwHttpAuthHandlerBase::Create(
-      this, auth_info_.get(), first_auth_attempt));
-
-  RenderFrameHost* render_frame_host = RenderFrameHost::FromID(
-      render_process_id_, render_frame_id_);
-  WebContents* web_contents = WebContents::FromRenderFrameHost(
-      render_frame_host);
-  if (!aw_http_auth_handler_->HandleOnUIThread(web_contents)) {
-    Cancel();
-    return;
-  }
-}
-
-void AwLoginDelegate::CancelOnIOThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  if (request_) {
-    request_->CancelAuth();
-    ResourceDispatcherHost::Get()->ClearLoginDelegateForRequest(request_);
-    request_ = NULL;
-  }
-  DeleteAuthHandlerSoon();
-}
-
-void AwLoginDelegate::ProceedOnIOThread(const base::string16& user,
-                                        const base::string16& password) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  if (request_) {
-    request_->SetAuth(net::AuthCredentials(user, password));
-    ResourceDispatcherHost::Get()->ClearLoginDelegateForRequest(request_);
-    request_ = NULL;
-  }
-  DeleteAuthHandlerSoon();
-}
-
-void AwLoginDelegate::OnRequestCancelled() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  request_ = NULL;
-  DeleteAuthHandlerSoon();
-}
-
-void AwLoginDelegate::DeleteAuthHandlerSoon() {
-  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(&AwLoginDelegate::DeleteAuthHandlerSoon, this));
-    return;
-  }
-  aw_http_auth_handler_.reset();
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_login_delegate.h b/android_webview/browser/aw_login_delegate.h
deleted file mode 100644
index 7d13400..0000000
--- a/android_webview/browser/aw_login_delegate.h
+++ /dev/null
@@ -1,51 +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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_LOGIN_DELEGATE_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_LOGIN_DELEGATE_H_
-
-#include "android_webview/browser/aw_http_auth_handler_base.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/strings/string16.h"
-#include "content/public/browser/resource_dispatcher_host_login_delegate.h"
-
-namespace net {
-class AuthChallengeInfo;
-class URLRequest;
-}
-
-namespace android_webview {
-
-class AwLoginDelegate :
-    public content::ResourceDispatcherHostLoginDelegate {
- public:
-  AwLoginDelegate(net::AuthChallengeInfo* auth_info,
-                  net::URLRequest* request);
-
-  virtual void Proceed(const base::string16& user,
-                       const base::string16& password);
-  virtual void Cancel();
-
-  // from ResourceDispatcherHostLoginDelegate
-  virtual void OnRequestCancelled() OVERRIDE;
-
- private:
-  virtual ~AwLoginDelegate();
-  void HandleHttpAuthRequestOnUIThread(bool first_auth_attempt);
-  void CancelOnIOThread();
-  void ProceedOnIOThread(const base::string16& user,
-                         const base::string16& password);
-  void DeleteAuthHandlerSoon();
-
-  scoped_ptr<AwHttpAuthHandlerBase> aw_http_auth_handler_;
-  scoped_refptr<net::AuthChallengeInfo> auth_info_;
-  net::URLRequest* request_;
-  int render_process_id_;
-  int render_frame_id_;
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_LOGIN_DELEGATE_H_
diff --git a/android_webview/browser/aw_pref_store.cc b/android_webview/browser/aw_pref_store.cc
deleted file mode 100644
index 9b84c19..0000000
--- a/android_webview/browser/aw_pref_store.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) 2013 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.
-
-#include "android_webview/browser/aw_pref_store.h"
-
-#include "base/memory/scoped_ptr.h"
-#include "base/values.h"
-
-AwPrefStore::AwPrefStore() {}
-
-AwPrefStore::~AwPrefStore() {}
-
-bool AwPrefStore::GetValue(const std::string& key,
-                           const base::Value** value) const {
-  return prefs_.GetValue(key, value);
-}
-
-bool AwPrefStore::GetMutableValue(const std::string& key,
-                                  base::Value** value) {
-  return prefs_.GetValue(key, value);
-}
-
-void AwPrefStore::AddObserver(PrefStore::Observer* observer) {
-  observers_.AddObserver(observer);
-}
-
-void AwPrefStore::RemoveObserver(PrefStore::Observer* observer) {
-  observers_.RemoveObserver(observer);
-}
-
-bool AwPrefStore::HasObservers() const {
-  return observers_.might_have_observers();
-}
-
-bool AwPrefStore::IsInitializationComplete() const {
-  return true;
-}
-
-void AwPrefStore::SetValue(const std::string& key, base::Value* value) {
-  DCHECK(value);
-  if (prefs_.SetValue(key, value))
-      ReportValueChanged(key);
-}
-
-void AwPrefStore::SetValueSilently(const std::string& key, base::Value* value) {
-  prefs_.SetValue(key, value);
-}
-
-void AwPrefStore::RemoveValue(const std::string& key) {
-  if (prefs_.RemoveValue(key))
-    ReportValueChanged(key);
-}
-
-bool AwPrefStore::ReadOnly() const {
-  return false;
-}
-
-PersistentPrefStore::PrefReadError AwPrefStore::GetReadError() const {
-  return PersistentPrefStore::PREF_READ_ERROR_NONE;
-}
-
-PersistentPrefStore::PrefReadError AwPrefStore::ReadPrefs() {
-  return PersistentPrefStore::PREF_READ_ERROR_NONE;
-}
-
-void AwPrefStore::ReadPrefsAsync(ReadErrorDelegate* error_delegate_raw) {
-}
-
-void AwPrefStore::ReportValueChanged(const std::string& key) {
-  FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(key));
-}
diff --git a/android_webview/browser/aw_pref_store.h b/android_webview/browser/aw_pref_store.h
deleted file mode 100644
index 1504d93..0000000
--- a/android_webview/browser/aw_pref_store.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2013 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_PREF_STORE_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_PREF_STORE_H_
-
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/observer_list.h"
-#include "base/prefs/persistent_pref_store.h"
-#include "base/prefs/pref_value_map.h"
-
-// A light-weight prefstore implementation that keeps preferences
-// in a memory backed store. This is not a persistent prefstore -- we
-// subclass the PersistentPrefStore here since it is needed by the
-// PrefService, which in turn is needed by the Autofill component.
-class AwPrefStore : public PersistentPrefStore {
- public:
-  AwPrefStore();
-
-  // Overriden from PrefStore.
-  virtual bool GetValue(const std::string& key,
-                        const base::Value** result) const OVERRIDE;
-  virtual void AddObserver(PrefStore::Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(PrefStore::Observer* observer) OVERRIDE;
-  virtual bool HasObservers() const OVERRIDE;
-  virtual bool IsInitializationComplete() const OVERRIDE;
-
-  // PersistentPrefStore overrides:
-  virtual bool GetMutableValue(const std::string& key,
-                               base::Value** result) OVERRIDE;
-  virtual void ReportValueChanged(const std::string& key) OVERRIDE;
-  virtual void SetValue(const std::string& key, base::Value* value) OVERRIDE;
-  virtual void SetValueSilently(const std::string& key,
-                                base::Value* value) OVERRIDE;
-  virtual void RemoveValue(const std::string& key) OVERRIDE;
-  virtual bool ReadOnly() const OVERRIDE;
-  virtual PrefReadError GetReadError() const OVERRIDE;
-  virtual PersistentPrefStore::PrefReadError ReadPrefs() OVERRIDE;
-  virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) OVERRIDE;
-  virtual void CommitPendingWrite() OVERRIDE {}
-
- protected:
-  virtual ~AwPrefStore();
-
- private:
-  // Stores the preference values.
-  PrefValueMap prefs_;
-
-  ObserverList<PrefStore::Observer, true> observers_;
-
-  DISALLOW_COPY_AND_ASSIGN(AwPrefStore);
-};
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_PREF_STORE_H_
diff --git a/android_webview/browser/aw_quota_manager_bridge.cc b/android_webview/browser/aw_quota_manager_bridge.cc
deleted file mode 100644
index ad2f3e0..0000000
--- a/android_webview/browser/aw_quota_manager_bridge.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2013 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.
-
-#include "android_webview/browser/aw_quota_manager_bridge.h"
-
-namespace android_webview {
-
-AwQuotaManagerBridge::AwQuotaManagerBridge() {}
-
-AwQuotaManagerBridge::~AwQuotaManagerBridge() {}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_quota_manager_bridge.h b/android_webview/browser/aw_quota_manager_bridge.h
deleted file mode 100644
index bc4da378..0000000
--- a/android_webview/browser/aw_quota_manager_bridge.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2013 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_QUOTA_MANAGER_BRIDGE_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_QUOTA_MANAGER_BRIDGE_H_
-
-#include "base/memory/ref_counted.h"
-
-namespace android_webview {
-
-// Empty base class so this can be refcounted by AwBrowserContext.
-class AwQuotaManagerBridge :
-    public base::RefCountedThreadSafe<AwQuotaManagerBridge> {
- protected:
-  friend class base::RefCountedThreadSafe<AwQuotaManagerBridge>;
-  AwQuotaManagerBridge();
-  virtual ~AwQuotaManagerBridge();
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_QUOTA_MANAGER_BRIDGE_H_
diff --git a/android_webview/browser/aw_quota_permission_context.cc b/android_webview/browser/aw_quota_permission_context.cc
deleted file mode 100644
index bb1c06c..0000000
--- a/android_webview/browser/aw_quota_permission_context.cc
+++ /dev/null
@@ -1,29 +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.
-
-#include "android_webview/browser/aw_quota_permission_context.h"
-
-#include "base/logging.h"
-
-using content::QuotaPermissionContext;
-
-namespace android_webview {
-
-AwQuotaPermissionContext::AwQuotaPermissionContext() {
-}
-
-AwQuotaPermissionContext::~AwQuotaPermissionContext() {
-}
-
-void AwQuotaPermissionContext::RequestQuotaPermission(
-    const content::StorageQuotaParams& params,
-    int render_process_id,
-    const PermissionCallback& callback) {
-  // Android WebView only uses storage::kStorageTypeTemporary type of storage
-  // with quota managed automatically, not through this interface. Therefore
-  // unconditionally disallow all quota requests here.
-  callback.Run(QUOTA_PERMISSION_RESPONSE_DISALLOW);
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_quota_permission_context.h b/android_webview/browser/aw_quota_permission_context.h
deleted file mode 100644
index 8d90aa5..0000000
--- a/android_webview/browser/aw_quota_permission_context.h
+++ /dev/null
@@ -1,31 +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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_QUOTA_PERMISSION_CONTEXT_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_QUOTA_PERMISSION_CONTEXT_H_
-
-#include "base/compiler_specific.h"
-#include "content/public/browser/quota_permission_context.h"
-
-namespace android_webview {
-
-class AwQuotaPermissionContext : public content::QuotaPermissionContext {
- public:
-  AwQuotaPermissionContext();
-
-  virtual void RequestQuotaPermission(
-      const content::StorageQuotaParams& params,
-      int render_process_id,
-      const PermissionCallback& callback) OVERRIDE;
-
- private:
-  virtual ~AwQuotaPermissionContext();
-
-  DISALLOW_COPY_AND_ASSIGN(AwQuotaPermissionContext);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_QUOTA_PERMISSION_CONTEXT_H_
-
diff --git a/android_webview/browser/aw_request_interceptor.cc b/android_webview/browser/aw_request_interceptor.cc
deleted file mode 100644
index 381a8ab..0000000
--- a/android_webview/browser/aw_request_interceptor.cc
+++ /dev/null
@@ -1,84 +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.
-
-#include "android_webview/browser/aw_request_interceptor.h"
-
-#include "android_webview/browser/aw_contents_io_thread_client.h"
-#include "android_webview/browser/aw_web_resource_response.h"
-#include "base/android/jni_string.h"
-#include "base/memory/scoped_ptr.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/resource_request_info.h"
-#include "net/url_request/url_request.h"
-#include "net/url_request/url_request_context.h"
-#include "net/url_request/url_request_context_getter.h"
-#include "net/url_request/url_request_job.h"
-
-using content::BrowserThread;
-using content::RenderViewHost;
-using content::ResourceRequestInfo;
-
-namespace android_webview {
-
-namespace {
-
-const void* kRequestAlreadyQueriedDataKey = &kRequestAlreadyQueriedDataKey;
-
-} // namespace
-
-AwRequestInterceptor::AwRequestInterceptor() {
-}
-
-AwRequestInterceptor::~AwRequestInterceptor() {
-}
-
-scoped_ptr<AwWebResourceResponse>
-AwRequestInterceptor::QueryForAwWebResourceResponse(
-    const GURL& location,
-    net::URLRequest* request) const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  int render_process_id, render_frame_id;
-  if (!ResourceRequestInfo::GetRenderFrameForRequest(
-      request, &render_process_id, &render_frame_id))
-    return scoped_ptr<AwWebResourceResponse>();
-
-  scoped_ptr<AwContentsIoThreadClient> io_thread_client =
-      AwContentsIoThreadClient::FromID(render_process_id, render_frame_id);
-
-  if (!io_thread_client.get())
-    return scoped_ptr<AwWebResourceResponse>();
-
-  return io_thread_client->ShouldInterceptRequest(location, request).Pass();
-}
-
-net::URLRequestJob* AwRequestInterceptor::MaybeInterceptRequest(
-    net::URLRequest* request,
-    net::NetworkDelegate* network_delegate) const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  // See if we've already found out the aw_web_resource_response for this
-  // request.
-  // This is done not only for efficiency reasons, but also for correctness
-  // as it is possible for the Interceptor chain to be invoked more than once
-  // in which case we don't want to query the embedder multiple times.
-  // Note: The Interceptor chain is not invoked more than once if we create a
-  // URLRequestJob in this method, so this is only caching negative hits.
-  if (request->GetUserData(kRequestAlreadyQueriedDataKey))
-    return NULL;
-  request->SetUserData(kRequestAlreadyQueriedDataKey,
-                       new base::SupportsUserData::Data());
-
-  scoped_ptr<AwWebResourceResponse> aw_web_resource_response =
-      QueryForAwWebResourceResponse(request->url(), request);
-
-  if (!aw_web_resource_response)
-    return NULL;
-
-  // The newly created job will own the AwWebResourceResponse.
-  return AwWebResourceResponse::CreateJobFor(
-      aw_web_resource_response.Pass(), request, network_delegate);
-}
-
-} // namespace android_webview
diff --git a/android_webview/browser/aw_request_interceptor.h b/android_webview/browser/aw_request_interceptor.h
deleted file mode 100644
index 813abbe8..0000000
--- a/android_webview/browser/aw_request_interceptor.h
+++ /dev/null
@@ -1,47 +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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_REQUEST_INTERCEPTOR_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_REQUEST_INTERCEPTOR_H_
-
-#include "base/memory/scoped_ptr.h"
-#include "net/url_request/url_request_interceptor.h"
-
-class GURL;
-
-namespace net {
-class URLRequest;
-class URLRequestContextGetter;
-class URLRequestJob;
-class NetworkDelegate;
-}
-
-namespace android_webview {
-
-class AwWebResourceResponse;
-
-// This class allows the Java-side embedder to substitute the default
-// URLRequest of a given request for an alternative job that will read data
-// from a Java stream.
-class AwRequestInterceptor : public net::URLRequestInterceptor {
- public:
-  AwRequestInterceptor();
-  virtual ~AwRequestInterceptor();
-
-  // net::URLRequestInterceptor override --------------------------------------
-  virtual net::URLRequestJob* MaybeInterceptRequest(
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE;
-
- private:
-  scoped_ptr<AwWebResourceResponse> QueryForAwWebResourceResponse(
-      const GURL& location,
-      net::URLRequest* request) const;
-
-  DISALLOW_COPY_AND_ASSIGN(AwRequestInterceptor);
-};
-
-} // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_REQUEST_INTERCEPTOR_H_
diff --git a/android_webview/browser/aw_resource_context.cc b/android_webview/browser/aw_resource_context.cc
deleted file mode 100644
index 6c06b6a..0000000
--- a/android_webview/browser/aw_resource_context.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2013 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.
-
-#include "android_webview/browser/aw_resource_context.h"
-
-#include "content/public/browser/browser_thread.h"
-#include "net/url_request/url_request_context.h"
-#include "net/url_request/url_request_context_getter.h"
-
-namespace android_webview {
-
-AwResourceContext::AwResourceContext(net::URLRequestContextGetter* getter)
-    : getter_(getter) {
-  DCHECK(getter_);
-}
-
-AwResourceContext::~AwResourceContext() {
-}
-
-void AwResourceContext::SetExtraHeaders(
-    const GURL& url, const std::string& headers) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  if (!url.is_valid()) return;
-  base::AutoLock scoped_lock(extra_headers_lock_);
-  if (!headers.empty())
-    extra_headers_[url.spec()] = headers;
-  else
-    extra_headers_.erase(url.spec());
-}
-
-std::string AwResourceContext::GetExtraHeaders(const GURL& url) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  if (!url.is_valid()) return std::string();
-  base::AutoLock scoped_lock(extra_headers_lock_);
-  std::map<std::string, std::string>::iterator iter =
-      extra_headers_.find(url.spec());
-  return iter != extra_headers_.end() ? iter->second : std::string();
-}
-
-net::HostResolver* AwResourceContext::GetHostResolver() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  return getter_->GetURLRequestContext()->host_resolver();
-}
-
-net::URLRequestContext* AwResourceContext::GetRequestContext() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  return getter_->GetURLRequestContext();
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_resource_context.h b/android_webview/browser/aw_resource_context.h
deleted file mode 100644
index baf52b9..0000000
--- a/android_webview/browser/aw_resource_context.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2013 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_RESOURCE_CONTEXT_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_RESOURCE_CONTEXT_H_
-
-#include <map>
-#include <string>
-
-#include "base/synchronization/lock.h"
-#include "content/public/browser/resource_context.h"
-
-namespace net {
-class URLRequestContextGetter;
-}
-
-namespace android_webview {
-
-class AwResourceContext : public content::ResourceContext {
- public:
-  explicit AwResourceContext(net::URLRequestContextGetter* getter);
-  virtual ~AwResourceContext();
-
-  void SetExtraHeaders(const GURL& url, const std::string& headers);
-  std::string GetExtraHeaders(const GURL& url);
-
-  // content::ResourceContext implementation.
-  virtual net::HostResolver* GetHostResolver() OVERRIDE;
-  virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
-
- private:
-  net::URLRequestContextGetter* getter_;
-
-  base::Lock extra_headers_lock_;
-  std::map<std::string, std::string> extra_headers_;
-
-  DISALLOW_COPY_AND_ASSIGN(AwResourceContext);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_RESOURCE_CONTEXT_H_
diff --git a/android_webview/browser/aw_result_codes.h b/android_webview/browser/aw_result_codes.h
deleted file mode 100644
index 5bbbe9a..0000000
--- a/android_webview/browser/aw_result_codes.h
+++ /dev/null
@@ -1,21 +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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_RESULT_CODES_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_RESULT_CODES_H_
-
-#include "content/public/common/result_codes.h"
-
-namespace android_webview {
-
-enum ResultCode {
-  RESULT_CODE_START = content::RESULT_CODE_LAST_CODE,
-
-  // A critical resource file is missing.
-  RESULT_CODE_MISSING_DATA,
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_RESULT_CODES_H_
diff --git a/android_webview/browser/aw_static_cookie_policy_unittest.cc b/android_webview/browser/aw_static_cookie_policy_unittest.cc
deleted file mode 100644
index edeb315..0000000
--- a/android_webview/browser/aw_static_cookie_policy_unittest.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2014 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.
-
-#include "android_webview/browser/aw_cookie_access_policy.h"
-
-#include "testing/gtest/include/gtest/gtest.h"
-
-class GURL;
-
-using android_webview::AwStaticCookiePolicy;
-using testing::Test;
-
-class AwStaticCookiePolicyTest : public Test {
- public:
-  static const GURL kUrlFirstParty;
-  static const GURL kUrlThirdParty;
-
-  AwStaticCookiePolicyTest() {}
-
-  void expectFirstPartyAccess(const AwStaticCookiePolicy& policy,
-                              bool expectedResult) {
-    EXPECT_EQ(expectedResult, policy.AllowSet(kUrlFirstParty, kUrlFirstParty));
-    EXPECT_EQ(expectedResult, policy.AllowGet(kUrlFirstParty, kUrlFirstParty));
-  }
-
-  void expectThirdPartyAccess(const AwStaticCookiePolicy& policy,
-                              bool expectedResult) {
-    EXPECT_EQ(expectedResult, policy.AllowSet(kUrlFirstParty, kUrlThirdParty));
-    EXPECT_EQ(expectedResult, policy.AllowGet(kUrlFirstParty, kUrlThirdParty));
-  }
-};
-
-const GURL AwStaticCookiePolicyTest::kUrlFirstParty =
-    GURL("http://first.example");
-const GURL AwStaticCookiePolicyTest::kUrlThirdParty =
-    GURL("http://third.example");
-
-TEST_F(AwStaticCookiePolicyTest, BlockAllCookies) {
-  AwStaticCookiePolicy policy(false /* allow_cookies */,
-                              false /* allow_third_party_cookies */);
-  expectFirstPartyAccess(policy, false);
-  expectThirdPartyAccess(policy, false);
-}
-
-TEST_F(AwStaticCookiePolicyTest, BlockAllCookiesWithThirdPartySet) {
-  AwStaticCookiePolicy policy(false /* allow_cookies */,
-                              true  /* allow_third_party_cookies */);
-  expectFirstPartyAccess(policy, false);
-  expectThirdPartyAccess(policy, false);
-}
-
-TEST_F(AwStaticCookiePolicyTest, FirstPartyCookiesOnly) {
-  AwStaticCookiePolicy policy(true  /* allow_cookies */,
-                              false /* allow_third_party_cookies */);
-  expectFirstPartyAccess(policy, true);
-  expectThirdPartyAccess(policy, false);
-}
-
-TEST_F(AwStaticCookiePolicyTest, AllowAllCookies) {
-  AwStaticCookiePolicy policy(true /* allow_cookies */,
-                              true /* allow_third_party_cookies */);
-  expectFirstPartyAccess(policy, true);
-  expectThirdPartyAccess(policy, true);
-}
-
diff --git a/android_webview/browser/aw_web_preferences_populater.cc b/android_webview/browser/aw_web_preferences_populater.cc
deleted file mode 100644
index 008cf5c..0000000
--- a/android_webview/browser/aw_web_preferences_populater.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 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.
-
-#include "android_webview/browser/aw_web_preferences_populater.h"
-
-namespace android_webview {
-
-AwWebPreferencesPopulater::~AwWebPreferencesPopulater() {}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_web_preferences_populater.h b/android_webview/browser/aw_web_preferences_populater.h
deleted file mode 100644
index 6fbd76b..0000000
--- a/android_webview/browser/aw_web_preferences_populater.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2013 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_WEB_PREFERENCES_POPULATER_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_WEB_PREFERENCES_POPULATER_H_
-
-namespace content {
-class WebContents;
-struct WebPreferences;
-}
-
-namespace android_webview {
-
-// Empty base class so this can be destroyed by AwContentBrowserClient.
-class AwWebPreferencesPopulater {
- public:
-  virtual ~AwWebPreferencesPopulater();
-
-  virtual void PopulateFor(content::WebContents* web_contents,
-                           content::WebPreferences* web_prefs) = 0;
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_WEB_PREFERENCES_POPULATER_H_
diff --git a/android_webview/browser/aw_web_resource_response.cc b/android_webview/browser/aw_web_resource_response.cc
deleted file mode 100644
index 412d9c2..0000000
--- a/android_webview/browser/aw_web_resource_response.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2014 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.
-
-#include "android_webview/browser/aw_web_resource_response.h"
-
-#include "android_webview/browser/input_stream.h"
-#include "android_webview/browser/net/android_stream_reader_url_request_job.h"
-#include "base/strings/string_number_conversions.h"
-#include "net/http/http_response_headers.h"
-
-namespace android_webview {
-
-namespace {
-
-class StreamReaderJobDelegateImpl
-    : public AndroidStreamReaderURLRequestJob::Delegate {
- public:
-  StreamReaderJobDelegateImpl(
-      scoped_ptr<AwWebResourceResponse> aw_web_resource_response)
-      : aw_web_resource_response_(aw_web_resource_response.Pass()) {
-    DCHECK(aw_web_resource_response_);
-  }
-
-  virtual scoped_ptr<InputStream> OpenInputStream(JNIEnv* env,
-                                                  const GURL& url) OVERRIDE {
-    return aw_web_resource_response_->GetInputStream(env).Pass();
-  }
-
-  virtual void OnInputStreamOpenFailed(net::URLRequest* request,
-                                       bool* restart) OVERRIDE {
-    *restart = false;
-  }
-
-  virtual bool GetMimeType(JNIEnv* env,
-                           net::URLRequest* request,
-                           android_webview::InputStream* stream,
-                           std::string* mime_type) OVERRIDE {
-    return aw_web_resource_response_->GetMimeType(env, mime_type);
-  }
-
-  virtual bool GetCharset(JNIEnv* env,
-                          net::URLRequest* request,
-                          android_webview::InputStream* stream,
-                          std::string* charset) OVERRIDE {
-    return aw_web_resource_response_->GetCharset(env, charset);
-  }
-
-  virtual void AppendResponseHeaders(
-      JNIEnv* env,
-      net::HttpResponseHeaders* headers) OVERRIDE {
-    int status_code;
-    std::string reason_phrase;
-    if (aw_web_resource_response_->GetStatusInfo(
-            env, &status_code, &reason_phrase)) {
-      std::string status_line("HTTP/1.1 ");
-      status_line.append(base::IntToString(status_code));
-      status_line.append(" ");
-      status_line.append(reason_phrase);
-      headers->ReplaceStatusLine(status_line);
-    }
-    aw_web_resource_response_->GetResponseHeaders(env, headers);
-  }
-
- private:
-  scoped_ptr<AwWebResourceResponse> aw_web_resource_response_;
-};
-
-}  // namespace
-
-// static
-net::URLRequestJob* AwWebResourceResponse::CreateJobFor(
-    scoped_ptr<AwWebResourceResponse> aw_web_resource_response,
-    net::URLRequest* request,
-    net::NetworkDelegate* network_delegate) {
-  DCHECK(aw_web_resource_response);
-  DCHECK(request);
-  DCHECK(network_delegate);
-
-  return new AndroidStreamReaderURLRequestJob(
-      request,
-      network_delegate,
-      make_scoped_ptr(
-          new StreamReaderJobDelegateImpl(aw_web_resource_response.Pass()))
-          .PassAs<AndroidStreamReaderURLRequestJob::Delegate>());
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/aw_web_resource_response.h b/android_webview/browser/aw_web_resource_response.h
deleted file mode 100644
index 34963606..0000000
--- a/android_webview/browser/aw_web_resource_response.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_INTERCEPTED_REQUEST_DATA_H_
-#define ANDROID_WEBVIEW_BROWSER_INTERCEPTED_REQUEST_DATA_H_
-
-#include <string>
-
-#include "base/android/jni_android.h"
-#include "base/memory/scoped_ptr.h"
-
-namespace net {
-class HttpResponseHeaders;
-class NetworkDelegate;
-class URLRequest;
-class URLRequestJob;
-}
-
-namespace android_webview {
-
-class InputStream;
-
-// This class represents the Java-side data that is to be used to complete a
-// particular URLRequest.
-class AwWebResourceResponse {
- public:
-  virtual ~AwWebResourceResponse() {}
-
-  virtual scoped_ptr<InputStream> GetInputStream(JNIEnv* env) const = 0;
-  virtual bool GetMimeType(JNIEnv* env, std::string* mime_type) const = 0;
-  virtual bool GetCharset(JNIEnv* env, std::string* charset) const = 0;
-  virtual bool GetStatusInfo(JNIEnv* env,
-                             int* status_code,
-                             std::string* reason_phrase) const = 0;
-  // If true is returned then |headers| contain the headers, if false is
-  // returned |headers| were not updated.
-  virtual bool GetResponseHeaders(
-      JNIEnv* env,
-      net::HttpResponseHeaders* headers) const = 0;
-
-  // This creates a URLRequestJob for the |request| wich will read data from
-  // the |aw_web_resource_response| structure (instead of going to the network
-  // or to the cache).
-  // The newly created job takes ownership of |aw_web_resource_response|.
-  static net::URLRequestJob* CreateJobFor(
-      scoped_ptr<AwWebResourceResponse> aw_web_resource_response,
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate);
-
- protected:
-  AwWebResourceResponse() {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(AwWebResourceResponse);
-};
-
-} // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_INTERCEPTED_REQUEST_DATA_H_
diff --git a/android_webview/browser/browser_view_renderer.cc b/android_webview/browser/browser_view_renderer.cc
deleted file mode 100644
index 0e118a8..0000000
--- a/android_webview/browser/browser_view_renderer.cc
+++ /dev/null
@@ -1,820 +0,0 @@
-// Copyright 2014 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.
-
-#include "android_webview/browser/browser_view_renderer.h"
-
-#include "android_webview/browser/browser_view_renderer_client.h"
-#include "android_webview/browser/shared_renderer_state.h"
-#include "android_webview/common/aw_switches.h"
-#include "android_webview/public/browser/draw_gl.h"
-#include "base/android/jni_android.h"
-#include "base/auto_reset.h"
-#include "base/command_line.h"
-#include "base/debug/trace_event.h"
-#include "base/json/json_writer.h"
-#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/stringprintf.h"
-#include "cc/output/compositor_frame.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/common/content_switches.h"
-#include "gpu/command_buffer/service/gpu_switches.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkPicture.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
-#include "ui/gfx/vector2d_conversions.h"
-
-using base::android::AttachCurrentThread;
-using base::android::JavaRef;
-using base::android::ScopedJavaLocalRef;
-using content::BrowserThread;
-using content::SynchronousCompositorMemoryPolicy;
-
-namespace android_webview {
-
-namespace {
-
-const int64 kFallbackTickTimeoutInMilliseconds = 100;
-
-// Used to calculate memory allocation. Determined experimentally.
-const size_t kMemoryMultiplier = 20;
-const size_t kBytesPerPixel = 4;
-const size_t kMemoryAllocationStep = 5 * 1024 * 1024;
-uint64 g_memory_override_in_bytes = 0u;
-
-// Used to calculate tile allocation. Determined experimentally.
-const size_t kTileMultiplier = 12;
-const size_t kTileAllocationStep = 20;
-// This will be set by static function CalculateTileMemoryPolicy() during init.
-// See AwMainDelegate::BasicStartupComplete.
-size_t g_tile_area;
-
-class TracedValue : public base::debug::ConvertableToTraceFormat {
- public:
-  explicit TracedValue(base::Value* value) : value_(value) {}
-  static scoped_refptr<base::debug::ConvertableToTraceFormat> FromValue(
-      base::Value* value) {
-    return scoped_refptr<base::debug::ConvertableToTraceFormat>(
-        new TracedValue(value));
-  }
-  virtual void AppendAsTraceFormat(std::string* out) const OVERRIDE {
-    std::string tmp;
-    base::JSONWriter::Write(value_.get(), &tmp);
-    *out += tmp;
-  }
-
- private:
-  virtual ~TracedValue() {}
-  scoped_ptr<base::Value> value_;
-
-  DISALLOW_COPY_AND_ASSIGN(TracedValue);
-};
-
-}  // namespace
-
-// static
-void BrowserViewRenderer::CalculateTileMemoryPolicy(bool use_zero_copy) {
-  CommandLine* cl = CommandLine::ForCurrentProcess();
-
-  // If the value was overridden on the command line, use the specified value.
-  bool client_hard_limit_bytes_overridden =
-      cl->HasSwitch(switches::kForceGpuMemAvailableMb);
-  if (client_hard_limit_bytes_overridden) {
-    base::StringToUint64(
-        base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-            switches::kForceGpuMemAvailableMb),
-        &g_memory_override_in_bytes);
-    g_memory_override_in_bytes *= 1024 * 1024;
-  }
-
-  if (!use_zero_copy) {
-    // Use chrome's default tile size, which varies from 256 to 512.
-    // Be conservative here and use the smallest tile size possible.
-    g_tile_area = 256 * 256;
-
-    // Also use a high tile limit since there are no file descriptor issues.
-    GlobalTileManager::GetInstance()->SetTileLimit(1000);
-    return;
-  }
-
-  const char kDefaultTileSize[] = "384";
-
-  if (!cl->HasSwitch(switches::kDefaultTileWidth))
-    cl->AppendSwitchASCII(switches::kDefaultTileWidth, kDefaultTileSize);
-
-  if (!cl->HasSwitch(switches::kDefaultTileHeight))
-    cl->AppendSwitchASCII(switches::kDefaultTileHeight, kDefaultTileSize);
-
-  size_t tile_size;
-  base::StringToSizeT(kDefaultTileSize, &tile_size);
-  g_tile_area = tile_size * tile_size;
-}
-
-BrowserViewRenderer::BrowserViewRenderer(
-    BrowserViewRendererClient* client,
-    SharedRendererState* shared_renderer_state,
-    content::WebContents* web_contents,
-    const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner)
-    : client_(client),
-      shared_renderer_state_(shared_renderer_state),
-      web_contents_(web_contents),
-      ui_task_runner_(ui_task_runner),
-      compositor_(NULL),
-      is_paused_(false),
-      view_visible_(false),
-      window_visible_(false),
-      attached_to_window_(false),
-      hardware_enabled_(false),
-      dip_scale_(0.0),
-      page_scale_factor_(1.0),
-      on_new_picture_enable_(false),
-      clear_view_(false),
-      compositor_needs_continuous_invalidate_(false),
-      block_invalidates_(false),
-      width_(0),
-      height_(0),
-      num_tiles_(0u),
-      num_bytes_(0u) {
-  CHECK(web_contents_);
-  content::SynchronousCompositor::SetClientForWebContents(web_contents_, this);
-
-  // Currently the logic in this class relies on |compositor_| remaining
-  // NULL until the DidInitializeCompositor() call, hence it is not set here.
-}
-
-BrowserViewRenderer::~BrowserViewRenderer() {
-  content::SynchronousCompositor::SetClientForWebContents(web_contents_, NULL);
-  // OnDetachedFromWindow should be called before the destructor, so the memory
-  // policy should have already been updated.
-}
-
-// This function updates the resource allocation in GlobalTileManager.
-void BrowserViewRenderer::TrimMemory(const int level, const bool visible) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  // Constants from Android ComponentCallbacks2.
-  enum {
-    TRIM_MEMORY_RUNNING_LOW = 10,
-    TRIM_MEMORY_UI_HIDDEN = 20,
-    TRIM_MEMORY_BACKGROUND = 40,
-  };
-
-  // Not urgent enough. TRIM_MEMORY_UI_HIDDEN is treated specially because
-  // it does not indicate memory pressure, but merely that the app is
-  // backgrounded.
-  if (level < TRIM_MEMORY_RUNNING_LOW || level == TRIM_MEMORY_UI_HIDDEN)
-    return;
-
-  // Do not release resources on view we expect to get DrawGL soon.
-  if (level < TRIM_MEMORY_BACKGROUND && visible)
-    return;
-
-  // Just set the memory limit to 0 and drop all tiles. This will be reset to
-  // normal levels in the next DrawGL call.
-  SynchronousCompositorMemoryPolicy zero_policy;
-  if (memory_policy_ == zero_policy)
-    return;
-
-  TRACE_EVENT0("android_webview", "BrowserViewRenderer::TrimMemory");
-
-  RequestMemoryPolicy(zero_policy);
-  EnforceMemoryPolicyImmediately(zero_policy);
-}
-
-SynchronousCompositorMemoryPolicy
-BrowserViewRenderer::CalculateDesiredMemoryPolicy() {
-  SynchronousCompositorMemoryPolicy policy;
-  size_t width = last_on_draw_global_visible_rect_.width();
-  size_t height = last_on_draw_global_visible_rect_.height();
-  policy.bytes_limit = kMemoryMultiplier * kBytesPerPixel * width * height;
-  // Round up to a multiple of kMemoryAllocationStep.
-  policy.bytes_limit =
-      (policy.bytes_limit / kMemoryAllocationStep + 1) * kMemoryAllocationStep;
-
-  if (g_memory_override_in_bytes)
-    policy.bytes_limit = static_cast<size_t>(g_memory_override_in_bytes);
-
-  size_t tiles = width * height * kTileMultiplier / g_tile_area;
-  // Round up to a multiple of kTileAllocationStep. The minimum number of tiles
-  // is also kTileAllocationStep.
-  tiles = (tiles / kTileAllocationStep + 1) * kTileAllocationStep;
-  policy.num_resources_limit = tiles;
-  return policy;
-}
-
-// This function updates the cached memory policy in shared renderer state, as
-// well as the tile resource allocation in GlobalTileManager.
-void BrowserViewRenderer::RequestMemoryPolicy(
-    SynchronousCompositorMemoryPolicy& new_policy) {
-  // This will be used in SetNumTiles.
-  num_bytes_ = new_policy.bytes_limit;
-
-  GlobalTileManager* manager = GlobalTileManager::GetInstance();
-
-  // The following line will call BrowserViewRenderer::SetTilesNum().
-  manager->RequestTiles(new_policy.num_resources_limit, tile_manager_key_);
-}
-
-void BrowserViewRenderer::SetNumTiles(size_t num_tiles,
-                                      bool effective_immediately) {
-  num_tiles_ = num_tiles;
-
-  memory_policy_.num_resources_limit = num_tiles_;
-  memory_policy_.bytes_limit = num_bytes_;
-
-  if (effective_immediately)
-    EnforceMemoryPolicyImmediately(memory_policy_);
-}
-
-void BrowserViewRenderer::EnforceMemoryPolicyImmediately(
-    SynchronousCompositorMemoryPolicy new_policy) {
-  compositor_->SetMemoryPolicy(new_policy);
-  ForceFakeCompositeSW();
-}
-
-size_t BrowserViewRenderer::GetNumTiles() const {
-  return memory_policy_.num_resources_limit;
-}
-
-bool BrowserViewRenderer::OnDraw(jobject java_canvas,
-                                 bool is_hardware_canvas,
-                                 const gfx::Vector2d& scroll,
-                                 const gfx::Rect& global_visible_rect) {
-  last_on_draw_scroll_offset_ = scroll;
-  last_on_draw_global_visible_rect_ = global_visible_rect;
-
-  if (clear_view_)
-    return false;
-
-  if (is_hardware_canvas && attached_to_window_ &&
-      !switches::ForceAuxiliaryBitmap()) {
-    return OnDrawHardware(java_canvas);
-  }
-
-  // Perform a software draw
-  return OnDrawSoftware(java_canvas);
-}
-
-bool BrowserViewRenderer::OnDrawHardware(jobject java_canvas) {
-  if (!compositor_)
-    return false;
-
-  if (last_on_draw_global_visible_rect_.IsEmpty())
-    return client_->RequestDrawGL(java_canvas, false);
-
-  if (!hardware_enabled_) {
-    hardware_enabled_ = compositor_->InitializeHwDraw();
-    if (hardware_enabled_) {
-      tile_manager_key_ = GlobalTileManager::GetInstance()->PushBack(this);
-    }
-  }
-  if (!hardware_enabled_)
-    return false;
-
-  ReturnResourceFromParent();
-  SynchronousCompositorMemoryPolicy new_policy = CalculateDesiredMemoryPolicy();
-  RequestMemoryPolicy(new_policy);
-  compositor_->SetMemoryPolicy(memory_policy_);
-
-  scoped_ptr<DrawGLInput> draw_gl_input(new DrawGLInput);
-  draw_gl_input->scroll_offset = last_on_draw_scroll_offset_;
-  draw_gl_input->width = width_;
-  draw_gl_input->height = height_;
-
-  parent_draw_constraints_ = shared_renderer_state_->ParentDrawConstraints();
-  gfx::Size surface_size(width_, height_);
-  gfx::Rect viewport(surface_size);
-  gfx::Rect clip = viewport;
-  gfx::Transform transform_for_tile_priority =
-      parent_draw_constraints_.transform;
-
-  // If the WebView is on a layer, WebView does not know what transform is
-  // applied onto the layer so global visible rect does not make sense here.
-  // In this case, just use the surface rect for tiling.
-  gfx::Rect viewport_rect_for_tile_priority;
-  if (parent_draw_constraints_.is_layer)
-    viewport_rect_for_tile_priority = parent_draw_constraints_.surface_rect;
-  else
-    viewport_rect_for_tile_priority = last_on_draw_global_visible_rect_;
-
-  scoped_ptr<cc::CompositorFrame> frame =
-      compositor_->DemandDrawHw(surface_size,
-                                gfx::Transform(),
-                                viewport,
-                                clip,
-                                viewport_rect_for_tile_priority,
-                                transform_for_tile_priority);
-  if (!frame.get())
-    return false;
-
-  GlobalTileManager::GetInstance()->DidUse(tile_manager_key_);
-
-  frame->AssignTo(&draw_gl_input->frame);
-  ReturnUnusedResource(shared_renderer_state_->PassDrawGLInput());
-  shared_renderer_state_->SetDrawGLInput(draw_gl_input.Pass());
-  DidComposite();
-  return client_->RequestDrawGL(java_canvas, false);
-}
-
-void BrowserViewRenderer::UpdateParentDrawConstraints() {
-  // Post an invalidate if the parent draw constraints are stale and there is
-  // no pending invalidate.
-  if (!parent_draw_constraints_.Equals(
-          shared_renderer_state_->ParentDrawConstraints()))
-    EnsureContinuousInvalidation(true);
-}
-
-void BrowserViewRenderer::ReturnUnusedResource(scoped_ptr<DrawGLInput> input) {
-  if (!input.get())
-    return;
-
-  cc::CompositorFrameAck frame_ack;
-  cc::TransferableResource::ReturnResources(
-      input->frame.delegated_frame_data->resource_list,
-      &frame_ack.resources);
-  if (!frame_ack.resources.empty())
-    compositor_->ReturnResources(frame_ack);
-}
-
-void BrowserViewRenderer::ReturnResourceFromParent() {
-  cc::CompositorFrameAck frame_ack;
-  shared_renderer_state_->SwapReturnedResources(&frame_ack.resources);
-  if (!frame_ack.resources.empty()) {
-    compositor_->ReturnResources(frame_ack);
-  }
-}
-
-bool BrowserViewRenderer::OnDrawSoftware(jobject java_canvas) {
-  if (!compositor_) {
-    TRACE_EVENT_INSTANT0(
-        "android_webview", "EarlyOut_NoCompositor", TRACE_EVENT_SCOPE_THREAD);
-    return false;
-  }
-
-  // TODO(hush): right now webview size is passed in as the auxiliary bitmap
-  // size, which might hurt performace (only for software draws with auxiliary
-  // bitmap). For better performance, get global visible rect, transform it
-  // from screen space to view space, then intersect with the webview in
-  // viewspace.  Use the resulting rect as the auxiliary
-  // bitmap.
-  return BrowserViewRendererJavaHelper::GetInstance()
-      ->RenderViaAuxilaryBitmapIfNeeded(
-          java_canvas,
-          last_on_draw_scroll_offset_,
-          gfx::Size(width_, height_),
-          base::Bind(&BrowserViewRenderer::CompositeSW,
-                     base::Unretained(this)));
-}
-
-skia::RefPtr<SkPicture> BrowserViewRenderer::CapturePicture(int width,
-                                                            int height) {
-  TRACE_EVENT0("android_webview", "BrowserViewRenderer::CapturePicture");
-
-  // Return empty Picture objects for empty SkPictures.
-  if (width <= 0 || height <= 0) {
-    SkPictureRecorder emptyRecorder;
-    emptyRecorder.beginRecording(0, 0);
-    return skia::AdoptRef(emptyRecorder.endRecording());
-  }
-
-  // Reset scroll back to the origin, will go back to the old
-  // value when scroll_reset is out of scope.
-  base::AutoReset<gfx::Vector2dF> scroll_reset(&scroll_offset_dip_,
-                                               gfx::Vector2dF());
-
-  SkPictureRecorder recorder;
-  SkCanvas* rec_canvas = recorder.beginRecording(width, height, NULL, 0);
-  if (compositor_)
-    CompositeSW(rec_canvas);
-  return skia::AdoptRef(recorder.endRecording());
-}
-
-void BrowserViewRenderer::EnableOnNewPicture(bool enabled) {
-  on_new_picture_enable_ = enabled;
-}
-
-void BrowserViewRenderer::ClearView() {
-  TRACE_EVENT_INSTANT0("android_webview",
-                       "BrowserViewRenderer::ClearView",
-                       TRACE_EVENT_SCOPE_THREAD);
-  if (clear_view_)
-    return;
-
-  clear_view_ = true;
-  // Always invalidate ignoring the compositor to actually clear the webview.
-  EnsureContinuousInvalidation(true);
-}
-
-void BrowserViewRenderer::SetIsPaused(bool paused) {
-  TRACE_EVENT_INSTANT1("android_webview",
-                       "BrowserViewRenderer::SetIsPaused",
-                       TRACE_EVENT_SCOPE_THREAD,
-                       "paused",
-                       paused);
-  is_paused_ = paused;
-  EnsureContinuousInvalidation(false);
-}
-
-void BrowserViewRenderer::SetViewVisibility(bool view_visible) {
-  TRACE_EVENT_INSTANT1("android_webview",
-                       "BrowserViewRenderer::SetViewVisibility",
-                       TRACE_EVENT_SCOPE_THREAD,
-                       "view_visible",
-                       view_visible);
-  view_visible_ = view_visible;
-}
-
-void BrowserViewRenderer::SetWindowVisibility(bool window_visible) {
-  TRACE_EVENT_INSTANT1("android_webview",
-                       "BrowserViewRenderer::SetWindowVisibility",
-                       TRACE_EVENT_SCOPE_THREAD,
-                       "window_visible",
-                       window_visible);
-  window_visible_ = window_visible;
-  EnsureContinuousInvalidation(false);
-}
-
-void BrowserViewRenderer::OnSizeChanged(int width, int height) {
-  TRACE_EVENT_INSTANT2("android_webview",
-                       "BrowserViewRenderer::OnSizeChanged",
-                       TRACE_EVENT_SCOPE_THREAD,
-                       "width",
-                       width,
-                       "height",
-                       height);
-  width_ = width;
-  height_ = height;
-}
-
-void BrowserViewRenderer::OnAttachedToWindow(int width, int height) {
-  TRACE_EVENT2("android_webview",
-               "BrowserViewRenderer::OnAttachedToWindow",
-               "width",
-               width,
-               "height",
-               height);
-  attached_to_window_ = true;
-  width_ = width;
-  height_ = height;
-}
-
-void BrowserViewRenderer::OnDetachedFromWindow() {
-  TRACE_EVENT0("android_webview", "BrowserViewRenderer::OnDetachedFromWindow");
-  attached_to_window_ = false;
-  DCHECK(!hardware_enabled_);
-}
-
-void BrowserViewRenderer::ReleaseHardware() {
-  DCHECK(hardware_enabled_);
-  ReturnUnusedResource(shared_renderer_state_->PassDrawGLInput());
-  ReturnResourceFromParent();
-  DCHECK(shared_renderer_state_->ReturnedResourcesEmpty());
-
-  compositor_->ReleaseHwDraw();
-  hardware_enabled_ = false;
-
-  SynchronousCompositorMemoryPolicy zero_policy;
-  RequestMemoryPolicy(zero_policy);
-  GlobalTileManager::GetInstance()->Remove(tile_manager_key_);
-}
-
-bool BrowserViewRenderer::IsVisible() const {
-  // Ignore |window_visible_| if |attached_to_window_| is false.
-  return view_visible_ && (!attached_to_window_ || window_visible_);
-}
-
-gfx::Rect BrowserViewRenderer::GetScreenRect() const {
-  return gfx::Rect(client_->GetLocationOnScreen(), gfx::Size(width_, height_));
-}
-
-void BrowserViewRenderer::DidInitializeCompositor(
-    content::SynchronousCompositor* compositor) {
-  TRACE_EVENT0("android_webview",
-               "BrowserViewRenderer::DidInitializeCompositor");
-  DCHECK(compositor);
-  DCHECK(!compositor_);
-  compositor_ = compositor;
-}
-
-void BrowserViewRenderer::DidDestroyCompositor(
-    content::SynchronousCompositor* compositor) {
-  TRACE_EVENT0("android_webview", "BrowserViewRenderer::DidDestroyCompositor");
-  DCHECK(compositor_);
-  compositor_ = NULL;
-  SynchronousCompositorMemoryPolicy zero_policy;
-  DCHECK(memory_policy_ == zero_policy);
-}
-
-void BrowserViewRenderer::SetContinuousInvalidate(bool invalidate) {
-  if (compositor_needs_continuous_invalidate_ == invalidate)
-    return;
-
-  TRACE_EVENT_INSTANT1("android_webview",
-                       "BrowserViewRenderer::SetContinuousInvalidate",
-                       TRACE_EVENT_SCOPE_THREAD,
-                       "invalidate",
-                       invalidate);
-  compositor_needs_continuous_invalidate_ = invalidate;
-
-  EnsureContinuousInvalidation(false);
-}
-
-void BrowserViewRenderer::SetDipScale(float dip_scale) {
-  dip_scale_ = dip_scale;
-  CHECK_GT(dip_scale_, 0);
-}
-
-gfx::Vector2d BrowserViewRenderer::max_scroll_offset() const {
-  DCHECK_GT(dip_scale_, 0);
-  return gfx::ToCeiledVector2d(gfx::ScaleVector2d(
-      max_scroll_offset_dip_, dip_scale_ * page_scale_factor_));
-}
-
-void BrowserViewRenderer::ScrollTo(gfx::Vector2d scroll_offset) {
-  gfx::Vector2d max_offset = max_scroll_offset();
-  gfx::Vector2dF scroll_offset_dip;
-  // To preserve the invariant that scrolling to the maximum physical pixel
-  // value also scrolls to the maximum dip pixel value we transform the physical
-  // offset into the dip offset by using a proportion (instead of dividing by
-  // dip_scale * page_scale_factor).
-  if (max_offset.x()) {
-    scroll_offset_dip.set_x((scroll_offset.x() * max_scroll_offset_dip_.x()) /
-                            max_offset.x());
-  }
-  if (max_offset.y()) {
-    scroll_offset_dip.set_y((scroll_offset.y() * max_scroll_offset_dip_.y()) /
-                            max_offset.y());
-  }
-
-  DCHECK_LE(0, scroll_offset_dip.x());
-  DCHECK_LE(0, scroll_offset_dip.y());
-  DCHECK_LE(scroll_offset_dip.x(), max_scroll_offset_dip_.x());
-  DCHECK_LE(scroll_offset_dip.y(), max_scroll_offset_dip_.y());
-
-  if (scroll_offset_dip_ == scroll_offset_dip)
-    return;
-
-  scroll_offset_dip_ = scroll_offset_dip;
-
-  TRACE_EVENT_INSTANT2("android_webview",
-               "BrowserViewRenderer::ScrollTo",
-               TRACE_EVENT_SCOPE_THREAD,
-               "x",
-               scroll_offset_dip.x(),
-               "y",
-               scroll_offset_dip.y());
-
-  if (compositor_)
-    compositor_->DidChangeRootLayerScrollOffset();
-}
-
-void BrowserViewRenderer::DidUpdateContent() {
-  TRACE_EVENT_INSTANT0("android_webview",
-                       "BrowserViewRenderer::DidUpdateContent",
-                       TRACE_EVENT_SCOPE_THREAD);
-  clear_view_ = false;
-  if (on_new_picture_enable_)
-    client_->OnNewPicture();
-}
-
-void BrowserViewRenderer::SetTotalRootLayerScrollOffset(
-    gfx::Vector2dF scroll_offset_dip) {
-  // TOOD(mkosiba): Add a DCHECK to say that this does _not_ get called during
-  // DrawGl when http://crbug.com/249972 is fixed.
-  if (scroll_offset_dip_ == scroll_offset_dip)
-    return;
-
-  scroll_offset_dip_ = scroll_offset_dip;
-
-  gfx::Vector2d max_offset = max_scroll_offset();
-  gfx::Vector2d scroll_offset;
-  // For an explanation as to why this is done this way see the comment in
-  // BrowserViewRenderer::ScrollTo.
-  if (max_scroll_offset_dip_.x()) {
-    scroll_offset.set_x((scroll_offset_dip.x() * max_offset.x()) /
-                        max_scroll_offset_dip_.x());
-  }
-
-  if (max_scroll_offset_dip_.y()) {
-    scroll_offset.set_y((scroll_offset_dip.y() * max_offset.y()) /
-                        max_scroll_offset_dip_.y());
-  }
-
-  DCHECK_LE(0, scroll_offset.x());
-  DCHECK_LE(0, scroll_offset.y());
-  DCHECK_LE(scroll_offset.x(), max_offset.x());
-  DCHECK_LE(scroll_offset.y(), max_offset.y());
-
-  client_->ScrollContainerViewTo(scroll_offset);
-}
-
-gfx::Vector2dF BrowserViewRenderer::GetTotalRootLayerScrollOffset() {
-  return scroll_offset_dip_;
-}
-
-bool BrowserViewRenderer::IsExternalFlingActive() const {
-  return client_->IsFlingActive();
-}
-
-void BrowserViewRenderer::UpdateRootLayerState(
-    const gfx::Vector2dF& total_scroll_offset_dip,
-    const gfx::Vector2dF& max_scroll_offset_dip,
-    const gfx::SizeF& scrollable_size_dip,
-    float page_scale_factor,
-    float min_page_scale_factor,
-    float max_page_scale_factor) {
-  TRACE_EVENT_INSTANT1(
-      "android_webview",
-      "BrowserViewRenderer::UpdateRootLayerState",
-      TRACE_EVENT_SCOPE_THREAD,
-      "state",
-      TracedValue::FromValue(
-          RootLayerStateAsValue(total_scroll_offset_dip, scrollable_size_dip)
-              .release()));
-
-  DCHECK_GT(dip_scale_, 0);
-
-  max_scroll_offset_dip_ = max_scroll_offset_dip;
-  DCHECK_LE(0, max_scroll_offset_dip_.x());
-  DCHECK_LE(0, max_scroll_offset_dip_.y());
-
-  page_scale_factor_ = page_scale_factor;
-  DCHECK_GT(page_scale_factor_, 0);
-
-  client_->UpdateScrollState(max_scroll_offset(),
-                             scrollable_size_dip,
-                             page_scale_factor,
-                             min_page_scale_factor,
-                             max_page_scale_factor);
-  SetTotalRootLayerScrollOffset(total_scroll_offset_dip);
-}
-
-scoped_ptr<base::Value> BrowserViewRenderer::RootLayerStateAsValue(
-    const gfx::Vector2dF& total_scroll_offset_dip,
-    const gfx::SizeF& scrollable_size_dip) {
-  scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue);
-
-  state->SetDouble("total_scroll_offset_dip.x", total_scroll_offset_dip.x());
-  state->SetDouble("total_scroll_offset_dip.y", total_scroll_offset_dip.y());
-
-  state->SetDouble("max_scroll_offset_dip.x", max_scroll_offset_dip_.x());
-  state->SetDouble("max_scroll_offset_dip.y", max_scroll_offset_dip_.y());
-
-  state->SetDouble("scrollable_size_dip.width", scrollable_size_dip.width());
-  state->SetDouble("scrollable_size_dip.height", scrollable_size_dip.height());
-
-  state->SetDouble("page_scale_factor", page_scale_factor_);
-  return state.PassAs<base::Value>();
-}
-
-void BrowserViewRenderer::DidOverscroll(gfx::Vector2dF accumulated_overscroll,
-                                        gfx::Vector2dF latest_overscroll_delta,
-                                        gfx::Vector2dF current_fling_velocity) {
-  const float physical_pixel_scale = dip_scale_ * page_scale_factor_;
-  if (accumulated_overscroll == latest_overscroll_delta)
-    overscroll_rounding_error_ = gfx::Vector2dF();
-  gfx::Vector2dF scaled_overscroll_delta =
-      gfx::ScaleVector2d(latest_overscroll_delta, physical_pixel_scale);
-  gfx::Vector2d rounded_overscroll_delta = gfx::ToRoundedVector2d(
-      scaled_overscroll_delta + overscroll_rounding_error_);
-  overscroll_rounding_error_ =
-      scaled_overscroll_delta - rounded_overscroll_delta;
-  client_->DidOverscroll(rounded_overscroll_delta);
-}
-
-void BrowserViewRenderer::EnsureContinuousInvalidation(bool force_invalidate) {
-  // This method should be called again when any of these conditions change.
-  bool need_invalidate =
-      compositor_needs_continuous_invalidate_ || force_invalidate;
-  if (!need_invalidate || block_invalidates_)
-    return;
-
-  // Always call view invalidate. We rely the Android framework to ignore the
-  // invalidate when it's not needed such as when view is not visible.
-  client_->PostInvalidate();
-
-  // Stop fallback ticks when one of these is true.
-  // 1) Webview is paused. Also need to check we are not in clear view since
-  // paused, offscreen still expect clear view to recover.
-  // 2) If we are attached to window and the window is not visible (eg when
-  // app is in the background). We are sure in this case the webview is used
-  // "on-screen" but that updates are not needed when in the background.
-  bool throttle_fallback_tick =
-      (is_paused_ && !clear_view_) || (attached_to_window_ && !window_visible_);
-  if (throttle_fallback_tick)
-    return;
-
-  block_invalidates_ = compositor_needs_continuous_invalidate_;
-
-  // Unretained here is safe because the callbacks are cancelled when
-  // they are destroyed.
-  post_fallback_tick_.Reset(base::Bind(&BrowserViewRenderer::PostFallbackTick,
-                                       base::Unretained(this)));
-  fallback_tick_fired_.Cancel();
-
-  // No need to reschedule fallback tick if compositor does not need to be
-  // ticked. This can happen if this is reached because force_invalidate is
-  // true.
-  if (compositor_needs_continuous_invalidate_)
-    ui_task_runner_->PostTask(FROM_HERE, post_fallback_tick_.callback());
-}
-
-void BrowserViewRenderer::PostFallbackTick() {
-  DCHECK(fallback_tick_fired_.IsCancelled());
-  fallback_tick_fired_.Reset(base::Bind(&BrowserViewRenderer::FallbackTickFired,
-                                        base::Unretained(this)));
-  if (compositor_needs_continuous_invalidate_) {
-    ui_task_runner_->PostDelayedTask(
-        FROM_HERE,
-        fallback_tick_fired_.callback(),
-        base::TimeDelta::FromMilliseconds(kFallbackTickTimeoutInMilliseconds));
-  } else {
-    // Pretend we just composited to unblock further invalidates.
-    DidComposite();
-  }
-}
-
-void BrowserViewRenderer::FallbackTickFired() {
-  TRACE_EVENT1("android_webview",
-               "BrowserViewRenderer::FallbackTickFired",
-               "compositor_needs_continuous_invalidate_",
-               compositor_needs_continuous_invalidate_);
-
-  // This should only be called if OnDraw or DrawGL did not come in time, which
-  // means block_invalidates_ must still be true.
-  DCHECK(block_invalidates_);
-  if (compositor_needs_continuous_invalidate_ && compositor_) {
-    ForceFakeCompositeSW();
-  } else {
-    // Pretend we just composited to unblock further invalidates.
-    DidComposite();
-  }
-}
-
-void BrowserViewRenderer::ForceFakeCompositeSW() {
-  DCHECK(compositor_);
-  SkBitmap bitmap;
-  bitmap.allocN32Pixels(1, 1);
-  bitmap.eraseColor(0);
-  SkCanvas canvas(bitmap);
-  CompositeSW(&canvas);
-}
-
-bool BrowserViewRenderer::CompositeSW(SkCanvas* canvas) {
-  DCHECK(compositor_);
-  ReturnResourceFromParent();
-  bool result = compositor_->DemandDrawSw(canvas);
-  DidComposite();
-  return result;
-}
-
-void BrowserViewRenderer::DidComposite() {
-  block_invalidates_ = false;
-  post_fallback_tick_.Cancel();
-  fallback_tick_fired_.Cancel();
-  EnsureContinuousInvalidation(false);
-}
-
-std::string BrowserViewRenderer::ToString(AwDrawGLInfo* draw_info) const {
-  std::string str;
-  base::StringAppendF(&str, "is_paused: %d ", is_paused_);
-  base::StringAppendF(&str, "view_visible: %d ", view_visible_);
-  base::StringAppendF(&str, "window_visible: %d ", window_visible_);
-  base::StringAppendF(&str, "dip_scale: %f ", dip_scale_);
-  base::StringAppendF(&str, "page_scale_factor: %f ", page_scale_factor_);
-  base::StringAppendF(&str,
-                      "compositor_needs_continuous_invalidate: %d ",
-                      compositor_needs_continuous_invalidate_);
-  base::StringAppendF(&str, "block_invalidates: %d ", block_invalidates_);
-  base::StringAppendF(&str, "view width height: [%d %d] ", width_, height_);
-  base::StringAppendF(&str, "attached_to_window: %d ", attached_to_window_);
-  base::StringAppendF(&str,
-                      "global visible rect: %s ",
-                      last_on_draw_global_visible_rect_.ToString().c_str());
-  base::StringAppendF(
-      &str, "scroll_offset_dip: %s ", scroll_offset_dip_.ToString().c_str());
-  base::StringAppendF(&str,
-                      "overscroll_rounding_error_: %s ",
-                      overscroll_rounding_error_.ToString().c_str());
-  base::StringAppendF(
-      &str, "on_new_picture_enable: %d ", on_new_picture_enable_);
-  base::StringAppendF(&str, "clear_view: %d ", clear_view_);
-  if (draw_info) {
-    base::StringAppendF(&str,
-                        "clip left top right bottom: [%d %d %d %d] ",
-                        draw_info->clip_left,
-                        draw_info->clip_top,
-                        draw_info->clip_right,
-                        draw_info->clip_bottom);
-    base::StringAppendF(&str,
-                        "surface width height: [%d %d] ",
-                        draw_info->width,
-                        draw_info->height);
-    base::StringAppendF(&str, "is_layer: %d ", draw_info->is_layer);
-  }
-  return str;
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/browser_view_renderer.h b/android_webview/browser/browser_view_renderer.h
deleted file mode 100644
index 76a8806..0000000
--- a/android_webview/browser/browser_view_renderer.h
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright (c) 2013 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
-#define ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
-
-#include "android_webview/browser/global_tile_manager.h"
-#include "android_webview/browser/global_tile_manager_client.h"
-#include "android_webview/browser/parent_compositor_draw_constraints.h"
-#include "android_webview/browser/shared_renderer_state.h"
-#include "base/android/scoped_java_ref.h"
-#include "base/callback.h"
-#include "base/cancelable_callback.h"
-#include "base/values.h"
-#include "content/public/browser/android/synchronous_compositor.h"
-#include "content/public/browser/android/synchronous_compositor_client.h"
-#include "skia/ext/refptr.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/vector2d_f.h"
-
-class SkCanvas;
-class SkPicture;
-struct AwDrawGLInfo;
-struct AwDrawSWFunctionTable;
-
-namespace content {
-class ContentViewCore;
-struct SynchronousCompositorMemoryPolicy;
-class WebContents;
-}
-
-namespace android_webview {
-
-class BrowserViewRendererClient;
-
-// Delegate to perform rendering actions involving Java objects.
-class BrowserViewRendererJavaHelper {
- public:
-  static BrowserViewRendererJavaHelper* GetInstance();
-
-  typedef base::Callback<bool(SkCanvas*)> RenderMethod;
-
-  // Try obtaining the native SkCanvas from |java_canvas| and call
-  // |render_source| with it. If that fails, allocate an auxilary bitmap
-  // for |render_source| to render into, then copy the bitmap into
-  // |java_canvas|.
-  virtual bool RenderViaAuxilaryBitmapIfNeeded(
-      jobject java_canvas,
-      const gfx::Vector2d& scroll_correction,
-      const gfx::Size& auxiliary_bitmap_size,
-      RenderMethod render_source) = 0;
-
- protected:
-  virtual ~BrowserViewRendererJavaHelper() {}
-};
-
-// Interface for all the WebView-specific content rendering operations.
-// Provides software and hardware rendering and the Capture Picture API.
-class BrowserViewRenderer : public content::SynchronousCompositorClient,
-                            public GlobalTileManagerClient {
- public:
-  static void CalculateTileMemoryPolicy(bool use_zero_copy);
-
-  BrowserViewRenderer(
-      BrowserViewRendererClient* client,
-      SharedRendererState* shared_renderer_state,
-      content::WebContents* web_contents,
-      const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner);
-
-  virtual ~BrowserViewRenderer();
-
-  // Main handler for view drawing: performs a SW draw immediately, or sets up
-  // a subsequent GL Draw (via BrowserViewRendererClient::RequestDrawGL) and
-  // returns true. A false return value indicates nothing was or will be drawn.
-  // |java_canvas| is the target of the draw. |is_hardware_canvas| indicates
-  // a GL Draw maybe possible on this canvas. |scroll| if the view's current
-  // scroll offset. |clip| is the canvas's clip bounds. |global_visible_rect|
-  // is the intersection of the view size and the window in window coordinates.
-  bool OnDraw(jobject java_canvas,
-              bool is_hardware_canvas,
-              const gfx::Vector2d& scroll,
-              const gfx::Rect& global_visible_rect);
-
-  // CapturePicture API methods.
-  skia::RefPtr<SkPicture> CapturePicture(int width, int height);
-  void EnableOnNewPicture(bool enabled);
-
-  void ClearView();
-
-  // View update notifications.
-  void SetIsPaused(bool paused);
-  void SetViewVisibility(bool visible);
-  void SetWindowVisibility(bool visible);
-  void OnSizeChanged(int width, int height);
-  void OnAttachedToWindow(int width, int height);
-  void OnDetachedFromWindow();
-
-  // Sets the scale for logical<->physical pixel conversions.
-  void SetDipScale(float dip_scale);
-
-  // Set the root layer scroll offset to |new_value|.
-  void ScrollTo(gfx::Vector2d new_value);
-
-  // Android views hierarchy gluing.
-  bool IsVisible() const;
-  gfx::Rect GetScreenRect() const;
-  bool attached_to_window() const { return attached_to_window_; }
-  bool hardware_enabled() const { return hardware_enabled_; }
-  void ReleaseHardware();
-
-  // Set the memory policy in shared renderer state and request the tiles from
-  // GlobalTileManager. The actually amount of memory allowed by
-  // GlobalTileManager may not be equal to what's requested in |policy|.
-  void RequestMemoryPolicy(content::SynchronousCompositorMemoryPolicy& policy);
-
-  void TrimMemory(const int level, const bool visible);
-
-  // SynchronousCompositorClient overrides.
-  virtual void DidInitializeCompositor(
-      content::SynchronousCompositor* compositor) OVERRIDE;
-  virtual void DidDestroyCompositor(content::SynchronousCompositor* compositor)
-      OVERRIDE;
-  virtual void SetContinuousInvalidate(bool invalidate) OVERRIDE;
-  virtual void DidUpdateContent() OVERRIDE;
-  virtual gfx::Vector2dF GetTotalRootLayerScrollOffset() OVERRIDE;
-  virtual void UpdateRootLayerState(
-      const gfx::Vector2dF& total_scroll_offset_dip,
-      const gfx::Vector2dF& max_scroll_offset_dip,
-      const gfx::SizeF& scrollable_size_dip,
-      float page_scale_factor,
-      float min_page_scale_factor,
-      float max_page_scale_factor) OVERRIDE;
-  virtual bool IsExternalFlingActive() const OVERRIDE;
-  virtual void DidOverscroll(gfx::Vector2dF accumulated_overscroll,
-                             gfx::Vector2dF latest_overscroll_delta,
-                             gfx::Vector2dF current_fling_velocity) OVERRIDE;
-
-  // GlobalTileManagerClient overrides.
-  virtual size_t GetNumTiles() const OVERRIDE;
-  virtual void SetNumTiles(size_t num_tiles,
-                           bool effective_immediately) OVERRIDE;
-
-  void UpdateParentDrawConstraints();
-
- private:
-  void SetTotalRootLayerScrollOffset(gfx::Vector2dF new_value_dip);
-  // Checks the continuous invalidate and block invalidate state, and schedule
-  // invalidates appropriately. If |force_invalidate| is true, then send a view
-  // invalidate regardless of compositor expectation.
-  void EnsureContinuousInvalidation(bool force_invalidate);
-  bool OnDrawSoftware(jobject java_canvas);
-  bool CompositeSW(SkCanvas* canvas);
-  void DidComposite();
-  scoped_ptr<base::Value> RootLayerStateAsValue(
-      const gfx::Vector2dF& total_scroll_offset_dip,
-      const gfx::SizeF& scrollable_size_dip);
-
-  bool OnDrawHardware(jobject java_canvas);
-  void ReturnUnusedResource(scoped_ptr<DrawGLInput> input);
-  void ReturnResourceFromParent();
-
-  // If we call up view invalidate and OnDraw is not called before a deadline,
-  // then we keep ticking the SynchronousCompositor so it can make progress.
-  // Do this in a two stage tick due to native MessageLoop favors delayed task,
-  // so ensure delayed task is inserted only after the draw task returns.
-  void PostFallbackTick();
-  void FallbackTickFired();
-
-  // Force invoke the compositor to run produce a 1x1 software frame that is
-  // immediately discarded. This is a hack to force invoke parts of the
-  // compositor that are not directly exposed here.
-  void ForceFakeCompositeSW();
-
-  void EnforceMemoryPolicyImmediately(
-      content::SynchronousCompositorMemoryPolicy policy);
-
-  gfx::Vector2d max_scroll_offset() const;
-
-  content::SynchronousCompositorMemoryPolicy CalculateDesiredMemoryPolicy();
-  // For debug tracing or logging. Return the string representation of this
-  // view renderer's state and the |draw_info| if provided.
-  std::string ToString(AwDrawGLInfo* draw_info) const;
-
-  BrowserViewRendererClient* client_;
-  SharedRendererState* shared_renderer_state_;
-  content::WebContents* web_contents_;
-  scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
-
-  content::SynchronousCompositor* compositor_;
-
-  bool is_paused_;
-  bool view_visible_;
-  bool window_visible_;  // Only applicable if |attached_to_window_| is true.
-  bool attached_to_window_;
-  bool hardware_enabled_;
-  float dip_scale_;
-  float page_scale_factor_;
-  bool on_new_picture_enable_;
-  bool clear_view_;
-
-  gfx::Vector2d last_on_draw_scroll_offset_;
-  gfx::Rect last_on_draw_global_visible_rect_;
-
-  // The draw constraints from the parent compositor. These are only used for
-  // tiling priority.
-  ParentCompositorDrawConstraints parent_draw_constraints_;
-
-  // When true, we should continuously invalidate and keep drawing, for example
-  // to drive animation. This value is set by the compositor and should always
-  // reflect the expectation of the compositor and not be reused for other
-  // states.
-  bool compositor_needs_continuous_invalidate_;
-
-  // Used to block additional invalidates while one is already pending.
-  bool block_invalidates_;
-
-  base::CancelableClosure post_fallback_tick_;
-  base::CancelableClosure fallback_tick_fired_;
-
-  int width_;
-  int height_;
-
-  // Current scroll offset in CSS pixels.
-  gfx::Vector2dF scroll_offset_dip_;
-
-  // Max scroll offset in CSS pixels.
-  gfx::Vector2dF max_scroll_offset_dip_;
-
-  // Used to prevent rounding errors from accumulating enough to generate
-  // visible skew (especially noticeable when scrolling up and down in the same
-  // spot over a period of time).
-  gfx::Vector2dF overscroll_rounding_error_;
-
-  GlobalTileManager::Key tile_manager_key_;
-  content::SynchronousCompositorMemoryPolicy memory_policy_;
-
-  // The following 2 are used to construct a memory policy and set the memory
-  // policy on the shared_renderer_state_ atomically.
-  size_t num_tiles_;
-  size_t num_bytes_;
-
-  DISALLOW_COPY_AND_ASSIGN(BrowserViewRenderer);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
diff --git a/android_webview/browser/browser_view_renderer_client.h b/android_webview/browser/browser_view_renderer_client.h
deleted file mode 100644
index 2fba4d2..0000000
--- a/android_webview/browser/browser_view_renderer_client.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_CLIENT_H_
-#define ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_CLIENT_H_
-
-#include "base/android/scoped_java_ref.h"
-#include "ui/gfx/geometry/point.h"
-#include "ui/gfx/geometry/size_f.h"
-#include "ui/gfx/geometry/vector2d_f.h"
-
-namespace android_webview {
-
-class BrowserViewRendererClient {
- public:
-  // Request DrawGL be called. Passing null |canvas| implies the request
-  // will be of AwDrawGLInfo::kModeProcess type. |wait_for_completion|
-  // will cause the call to block until DrawGL has happened; it does not
-  // work when |canvas| is not NULL. The callback may never be made, and
-  // the mode may be promoted to kModeDraw.
-  virtual bool RequestDrawGL(jobject canvas, bool wait_for_completion) = 0;
-
-  // Called when a new Picture is available. Needs to be enabled
-  // via the EnableOnNewPicture method.
-  virtual void OnNewPicture() = 0;
-
-  // Called to trigger view invalidations.
-  virtual void PostInvalidate() = 0;
-
-  // Called to update the parent draw constraints in browser view renderer.
-  virtual void UpdateParentDrawConstraints() = 0;
-
-  // Called to get view's absolute location on the screen.
-  virtual gfx::Point GetLocationOnScreen() = 0;
-
-  // Try to set the view's scroll offset to |new_value|.
-  virtual void ScrollContainerViewTo(gfx::Vector2d new_value) = 0;
-
-  // Is a Android view system managed fling in progress?
-  virtual bool IsFlingActive() const = 0;
-
-  // Sets the following:
-  // view's scroll offset cap to |max_scroll_offset|,
-  // current contents_size to |contents_size_dip|,
-  // the current page scale to |page_scale_factor| and page scale limits
-  // to |min_page_scale_factor|..|max_page_scale_factor|.
-  virtual void UpdateScrollState(gfx::Vector2d max_scroll_offset,
-                                 gfx::SizeF contents_size_dip,
-                                 float page_scale_factor,
-                                 float min_page_scale_factor,
-                                 float max_page_scale_factor) = 0;
-
-  // Handle overscroll.
-  virtual void DidOverscroll(gfx::Vector2d overscroll_delta) = 0;
-
- protected:
-  virtual ~BrowserViewRendererClient() {}
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_CLIENT_H_
diff --git a/android_webview/browser/deferred_gpu_command_service.cc b/android_webview/browser/deferred_gpu_command_service.cc
deleted file mode 100644
index bc1eec0e..0000000
--- a/android_webview/browser/deferred_gpu_command_service.cc
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2014 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.
-
-#include "android_webview/browser/deferred_gpu_command_service.h"
-
-#include "android_webview/browser/gl_view_renderer_manager.h"
-#include "android_webview/browser/shared_renderer_state.h"
-#include "base/debug/trace_event.h"
-#include "base/lazy_instance.h"
-#include "base/synchronization/lock.h"
-#include "content/public/browser/android/synchronous_compositor.h"
-#include "gpu/command_buffer/service/shader_translator_cache.h"
-
-namespace android_webview {
-
-namespace {
-base::LazyInstance<scoped_refptr<DeferredGpuCommandService> >
-    g_service = LAZY_INSTANCE_INITIALIZER;
-}  // namespace
-
-base::LazyInstance<base::ThreadLocalBoolean> ScopedAllowGL::allow_gl;
-
-// static
-bool ScopedAllowGL::IsAllowed() {
-  return allow_gl.Get().Get();
-}
-
-ScopedAllowGL::ScopedAllowGL() {
-  DCHECK(!allow_gl.Get().Get());
-  allow_gl.Get().Set(true);
-
-  if (g_service.Get())
-    g_service.Get()->RunTasks();
-}
-
-ScopedAllowGL::~ScopedAllowGL() {
-  allow_gl.Get().Set(false);
-
-  DeferredGpuCommandService* service = g_service.Get();
-  if (service) {
-    service->RunTasks();
-    if (service->IdleQueueSize()) {
-      service->RequestProcessGL();
-    }
-  }
-}
-
-// static
-void DeferredGpuCommandService::SetInstance() {
-  if (!g_service.Get()) {
-    g_service.Get() = new DeferredGpuCommandService;
-    content::SynchronousCompositor::SetGpuService(g_service.Get());
-  }
-}
-
-// static
-DeferredGpuCommandService* DeferredGpuCommandService::GetInstance() {
-  DCHECK(g_service.Get().get());
-  return g_service.Get().get();
-}
-
-DeferredGpuCommandService::DeferredGpuCommandService() {}
-
-DeferredGpuCommandService::~DeferredGpuCommandService() {
-  base::AutoLock lock(tasks_lock_);
-  DCHECK(tasks_.empty());
-}
-
-// This method can be called on any thread.
-// static
-void DeferredGpuCommandService::RequestProcessGL() {
-  SharedRendererState* renderer_state =
-      GLViewRendererManager::GetInstance()->GetMostRecentlyDrawn();
-  if (!renderer_state) {
-    LOG(ERROR) << "No hardware renderer. Deadlock likely";
-    return;
-  }
-  renderer_state->ClientRequestDrawGL();
-}
-
-// Called from different threads!
-void DeferredGpuCommandService::ScheduleTask(const base::Closure& task) {
-  {
-    base::AutoLock lock(tasks_lock_);
-    tasks_.push(task);
-  }
-  if (ScopedAllowGL::IsAllowed()) {
-    RunTasks();
-  } else {
-    RequestProcessGL();
-  }
-}
-
-size_t DeferredGpuCommandService::IdleQueueSize() {
-  base::AutoLock lock(tasks_lock_);
-  return idle_tasks_.size();
-}
-
-void DeferredGpuCommandService::ScheduleIdleWork(
-    const base::Closure& callback) {
-  {
-    base::AutoLock lock(tasks_lock_);
-    idle_tasks_.push(std::make_pair(base::Time::Now(), callback));
-  }
-  RequestProcessGL();
-}
-
-void DeferredGpuCommandService::PerformIdleWork(bool is_idle) {
-  TRACE_EVENT1("android_webview",
-               "DeferredGpuCommandService::PerformIdleWork",
-               "is_idle",
-               is_idle);
-  DCHECK(ScopedAllowGL::IsAllowed());
-  static const base::TimeDelta kMaxIdleAge =
-      base::TimeDelta::FromMilliseconds(16);
-
-  const base::Time now = base::Time::Now();
-  size_t queue_size = IdleQueueSize();
-  while (queue_size--) {
-    base::Closure task;
-    {
-      base::AutoLock lock(tasks_lock_);
-      if (!is_idle) {
-        // Only run old tasks if we are not really idle right now.
-        base::TimeDelta age(now - idle_tasks_.front().first);
-        if (age < kMaxIdleAge)
-          break;
-      }
-      task = idle_tasks_.front().second;
-      idle_tasks_.pop();
-    }
-    task.Run();
-  }
-}
-
-void DeferredGpuCommandService::PerformAllIdleWork() {
-  TRACE_EVENT0("android_webview",
-               "DeferredGpuCommandService::PerformAllIdleWork");
-  while (IdleQueueSize()) {
-    PerformIdleWork(true);
-  }
-}
-
-bool DeferredGpuCommandService::UseVirtualizedGLContexts() { return true; }
-
-scoped_refptr<gpu::gles2::ShaderTranslatorCache>
-DeferredGpuCommandService::shader_translator_cache() {
-  if (!shader_translator_cache_.get())
-    shader_translator_cache_ = new gpu::gles2::ShaderTranslatorCache;
-  return shader_translator_cache_;
-}
-
-void DeferredGpuCommandService::RunTasks() {
-  bool has_more_tasks;
-  {
-    base::AutoLock lock(tasks_lock_);
-    has_more_tasks = tasks_.size() > 0;
-  }
-
-  while (has_more_tasks) {
-    base::Closure task;
-    {
-      base::AutoLock lock(tasks_lock_);
-      task = tasks_.front();
-      tasks_.pop();
-    }
-    task.Run();
-    {
-      base::AutoLock lock(tasks_lock_);
-      has_more_tasks = tasks_.size() > 0;
-    }
-  }
-}
-
-void DeferredGpuCommandService::AddRef() const {
-  base::RefCountedThreadSafe<DeferredGpuCommandService>::AddRef();
-}
-
-void DeferredGpuCommandService::Release() const {
-  base::RefCountedThreadSafe<DeferredGpuCommandService>::Release();
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/deferred_gpu_command_service.h b/android_webview/browser/deferred_gpu_command_service.h
deleted file mode 100644
index c84df5b..0000000
--- a/android_webview/browser/deferred_gpu_command_service.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_DEFERRED_GPU_COMMAND_SERVICE_H_
-#define ANDROID_WEBVIEW_BROWSER_DEFERRED_GPU_COMMAND_SERVICE_H_
-
-#include <queue>
-#include <utility>
-
-#include "base/lazy_instance.h"
-#include "base/memory/ref_counted.h"
-#include "base/threading/thread_local.h"
-#include "base/time/time.h"
-#include "gpu/command_buffer/service/in_process_command_buffer.h"
-
-namespace android_webview {
-
-class ScopedAllowGL {
- public:
-  ScopedAllowGL();
-  ~ScopedAllowGL();
-
-  static bool IsAllowed();
-
- private:
-  static base::LazyInstance<base::ThreadLocalBoolean> allow_gl;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedAllowGL);
-};
-
-class DeferredGpuCommandService
-    : public gpu::InProcessCommandBuffer::Service,
-      public base::RefCountedThreadSafe<DeferredGpuCommandService> {
- public:
-  static void SetInstance();
-  static DeferredGpuCommandService* GetInstance();
-
-  virtual void ScheduleTask(const base::Closure& task) OVERRIDE;
-  virtual void ScheduleIdleWork(const base::Closure& task) OVERRIDE;
-  virtual bool UseVirtualizedGLContexts() OVERRIDE;
-  virtual scoped_refptr<gpu::gles2::ShaderTranslatorCache>
-      shader_translator_cache() OVERRIDE;
-
-  void RunTasks();
-  // If |is_idle| is false, this will only run older idle tasks.
-  void PerformIdleWork(bool is_idle);
-  // Flush the idle queue until it is empty. This is different from
-  // PerformIdleWork(is_idle = true), which does not run any newly scheduled
-  // idle tasks during the idle run.
-  void PerformAllIdleWork();
-
-  virtual void AddRef() const OVERRIDE;
-  virtual void Release() const OVERRIDE;
-
- protected:
-  virtual ~DeferredGpuCommandService();
-  friend class base::RefCountedThreadSafe<DeferredGpuCommandService>;
-
- private:
-  friend class ScopedAllowGL;
-  static void RequestProcessGL();
-
-  DeferredGpuCommandService();
-  size_t IdleQueueSize();
-
-  base::Lock tasks_lock_;
-  std::queue<base::Closure> tasks_;
-  std::queue<std::pair<base::Time, base::Closure> > idle_tasks_;
-
-  scoped_refptr<gpu::gles2::ShaderTranslatorCache> shader_translator_cache_;
-  DISALLOW_COPY_AND_ASSIGN(DeferredGpuCommandService);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_DEFERRED_GPU_COMMAND_SERVICE_H_
diff --git a/android_webview/browser/find_helper.cc b/android_webview/browser/find_helper.cc
deleted file mode 100644
index 9a66f07..0000000
--- a/android_webview/browser/find_helper.cc
+++ /dev/null
@@ -1,133 +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.
-
-#include "android_webview/browser/find_helper.h"
-
-#include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
-#include "base/message_loop/message_loop.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/common/stop_find_action.h"
-#include "third_party/WebKit/public/web/WebFindOptions.h"
-
-using content::WebContents;
-using blink::WebFindOptions;
-
-namespace android_webview {
-
-FindHelper::FindHelper(WebContents* web_contents)
-    : WebContentsObserver(web_contents),
-      listener_(NULL),
-      async_find_started_(false),
-      sync_find_started_(false),
-      find_request_id_counter_(0),
-      current_request_id_(0),
-      last_match_count_(-1),
-      last_active_ordinal_(-1),
-      weak_factory_(this) {
-}
-
-FindHelper::~FindHelper() {
-}
-
-void FindHelper::SetListener(Listener* listener) {
-  listener_ = listener;
-}
-
-void FindHelper::FindAllAsync(const base::string16& search_string) {
-  // Stop any ongoing asynchronous request.
-  web_contents()->StopFinding(content::STOP_FIND_ACTION_KEEP_SELECTION);
-
-  sync_find_started_ = false;
-  async_find_started_ = true;
-
-  WebFindOptions options;
-  options.forward = true;
-  options.matchCase = false;
-  options.findNext = false;
-
-  StartNewRequest(search_string);
-  web_contents()->Find(current_request_id_, search_string, options);
-}
-
-void FindHelper::HandleFindReply(int request_id,
-                                   int match_count,
-                                   int active_ordinal,
-                                   bool finished) {
-  if ((!async_find_started_ && !sync_find_started_) ||
-      request_id != current_request_id_) {
-    return;
-  }
-
-  NotifyResults(active_ordinal, match_count, finished);
-}
-
-void FindHelper::FindNext(bool forward) {
-  if (!sync_find_started_ && !async_find_started_)
-    return;
-
-  WebFindOptions options;
-  options.forward = forward;
-  options.matchCase = false;
-  options.findNext = true;
-
-  web_contents()->Find(current_request_id_, last_search_string_, options);
-}
-
-void FindHelper::ClearMatches() {
-  web_contents()->StopFinding(content::STOP_FIND_ACTION_CLEAR_SELECTION);
-
-  sync_find_started_ = false;
-  async_find_started_ = false;
-  last_search_string_.clear();
-  last_match_count_ = -1;
-  last_active_ordinal_ = -1;
-}
-
-void FindHelper::StartNewRequest(const base::string16& search_string) {
-  current_request_id_ = find_request_id_counter_++;
-  last_search_string_ = search_string;
-  last_match_count_ = -1;
-  last_active_ordinal_ = -1;
-}
-
-void FindHelper::NotifyResults(int active_ordinal,
-                                 int match_count,
-                                 bool finished) {
-  // Match count or ordinal values set to -1 refer to the received replies.
-  if (match_count == -1)
-    match_count = last_match_count_;
-  else
-    last_match_count_ = match_count;
-
-  if (active_ordinal == -1)
-    active_ordinal = last_active_ordinal_;
-  else
-    last_active_ordinal_ = active_ordinal;
-
-  // Skip the update if we don't still have a valid ordinal.
-  // The next update, final or not, should have this information.
-  if (!finished && active_ordinal == -1)
-    return;
-
-  // Safeguard in case of errors to prevent reporting -1 to the API listeners.
-  if (match_count == -1) {
-    NOTREACHED();
-    match_count = 0;
-  }
-
-  if (active_ordinal == -1) {
-    NOTREACHED();
-    active_ordinal = 0;
-  }
-
-  // WebView.FindListener active match ordinals are 0-based while WebKit sends
-  // 1-based ordinals. Still we can receive 0 ordinal in case of no results.
-  active_ordinal = std::max(active_ordinal - 1, 0);
-
-  if (listener_)
-    listener_->OnFindResultReceived(active_ordinal, match_count, finished);
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/find_helper.h b/android_webview/browser/find_helper.h
deleted file mode 100644
index eabf1975..0000000
--- a/android_webview/browser/find_helper.h
+++ /dev/null
@@ -1,74 +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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_FIND_HELPER_H_
-#define ANDROID_WEBVIEW_BROWSER_FIND_HELPER_H_
-
-#include "base/memory/weak_ptr.h"
-#include "content/public/browser/web_contents_observer.h"
-
-namespace android_webview {
-
-// Handles the WebView find-in-page API requests.
-class FindHelper : public content::WebContentsObserver {
- public:
-  class Listener {
-   public:
-    // Called when receiving a new find-in-page update.
-    // This will be triggered when the results of FindAllSync, FindAllAsync and
-    // FindNext are available. The value provided in active_ordinal is 0-based.
-    virtual void OnFindResultReceived(int active_ordinal,
-                                      int match_count,
-                                      bool finished) = 0;
-    virtual ~Listener() {}
-  };
-
-  explicit FindHelper(content::WebContents* web_contents);
-  virtual ~FindHelper();
-
-  // Sets the listener to receive find result updates.
-  // Does not own the listener and must set to NULL when invalid.
-  void SetListener(Listener* listener);
-
-  // Asynchronous API.
-  void FindAllAsync(const base::string16& search_string);
-  void HandleFindReply(int request_id,
-                       int match_count,
-                       int active_ordinal,
-                       bool finished);
-
-  // Methods valid in both synchronous and asynchronous modes.
-  void FindNext(bool forward);
-  void ClearMatches();
-
- private:
-  void StartNewRequest(const base::string16& search_string);
-  void NotifyResults(int active_ordinal, int match_count, bool finished);
-
-  // Listener results are reported to.
-  Listener* listener_;
-
-  // Used to check the validity of FindNext operations.
-  bool async_find_started_;
-  bool sync_find_started_;
-
-  // Used to provide different ids to each request and for result
-  // verification in asynchronous calls.
-  int find_request_id_counter_;
-  int current_request_id_;
-
-  // Required by FindNext and the incremental find replies.
-  base::string16 last_search_string_;
-  int last_match_count_;
-  int last_active_ordinal_;
-
-  // Used to post synchronous result notifications to ourselves.
-  base::WeakPtrFactory<FindHelper> weak_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(FindHelper);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_FIND_HELPER_H_
diff --git a/android_webview/browser/gl_view_renderer_manager.cc b/android_webview/browser/gl_view_renderer_manager.cc
deleted file mode 100644
index 204239c..0000000
--- a/android_webview/browser/gl_view_renderer_manager.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2013 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.
-
-#include "android_webview/browser/gl_view_renderer_manager.h"
-
-#include "base/logging.h"
-#include "base/threading/platform_thread.h"
-
-namespace android_webview {
-
-using base::AutoLock;
-
-namespace {
-base::LazyInstance<GLViewRendererManager>::Leaky g_view_renderer_manager =
-    LAZY_INSTANCE_INITIALIZER;
-}  // namespace
-
-// static
-GLViewRendererManager* GLViewRendererManager::GetInstance() {
-  return g_view_renderer_manager.Pointer();
-}
-
-GLViewRendererManager::GLViewRendererManager() {}
-
-GLViewRendererManager::~GLViewRendererManager() {}
-
-GLViewRendererManager::Key GLViewRendererManager::NullKey() {
-  AutoLock auto_lock(lock_);
-  return mru_list_.end();
-}
-
-GLViewRendererManager::Key GLViewRendererManager::PushBack(RendererType view) {
-  AutoLock auto_lock(lock_);
-  DCHECK(mru_list_.end() ==
-         std::find(mru_list_.begin(), mru_list_.end(), view));
-  mru_list_.push_back(view);
-  Key back = mru_list_.end();
-  back--;
-  return back;
-}
-
-void GLViewRendererManager::DidDrawGL(Key key) {
-  AutoLock auto_lock(lock_);
-  DCHECK(mru_list_.end() != key);
-  mru_list_.splice(mru_list_.begin(), mru_list_, key);
-}
-
-void GLViewRendererManager::Remove(Key key) {
-  AutoLock auto_lock(lock_);
-  DCHECK(mru_list_.end() != key);
-  mru_list_.erase(key);
-}
-
-GLViewRendererManager::RendererType
-GLViewRendererManager::GetMostRecentlyDrawn() const {
-  AutoLock auto_lock(lock_);
-  if (mru_list_.begin() == mru_list_.end())
-    return NULL;
-  return *mru_list_.begin();
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/gl_view_renderer_manager.h b/android_webview/browser/gl_view_renderer_manager.h
deleted file mode 100644
index f34d9cb..0000000
--- a/android_webview/browser/gl_view_renderer_manager.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2013 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_GL_VIEW_RENDERER_MANAGER_H_
-#define ANDROID_WEBVIEW_BROWSER_GL_VIEW_RENDERER_MANAGER_H_
-
-#include <list>
-
-#include "base/basictypes.h"
-#include "base/lazy_instance.h"
-#include "base/synchronization/lock.h"
-#include "base/threading/platform_thread.h"
-
-namespace android_webview {
-
-class SharedRendererState;
-
-class GLViewRendererManager {
- public:
-  typedef SharedRendererState* RendererType;
-
- private:
-  typedef std::list<RendererType> ListType;
-
- public:
-  typedef ListType::iterator Key;
-
-  static GLViewRendererManager* GetInstance();
-
-  Key NullKey();
-
-  Key PushBack(RendererType view);
-
-  // |key| must be already in manager. Move renderer corresponding to |key| to
-  // most recent.
-  void DidDrawGL(Key key);
-
-  void Remove(Key key);
-
-  RendererType GetMostRecentlyDrawn() const;
-
- private:
-  friend struct base::DefaultLazyInstanceTraits<GLViewRendererManager>;
-
-  GLViewRendererManager();
-  ~GLViewRendererManager();
-
-  mutable base::Lock lock_;
-  ListType mru_list_;
-
-  DISALLOW_COPY_AND_ASSIGN(GLViewRendererManager);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_GL_VIEW_RENDERER_MANAGER_H_
diff --git a/android_webview/browser/global_tile_manager.cc b/android_webview/browser/global_tile_manager.cc
deleted file mode 100644
index a2fe4b6..0000000
--- a/android_webview/browser/global_tile_manager.cc
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2014 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.
-
-#include "android_webview/browser/global_tile_manager.h"
-#include "android_webview/browser/global_tile_manager_client.h"
-#include "base/lazy_instance.h"
-
-namespace android_webview {
-
-namespace {
-
-base::LazyInstance<GlobalTileManager>::Leaky g_tile_manager =
-    LAZY_INSTANCE_INITIALIZER;
-
-// The soft limit of the number of file descriptors per process is 1024 on
-// Android and gralloc buffers may not be the only thing that uses file
-// descriptors. For each tile, there is a gralloc buffer backing it, which
-// uses 2 FDs.
-const size_t kNumTilesLimit = 450;
-
-}  // namespace
-
-// static
-GlobalTileManager* GlobalTileManager::GetInstance() {
-  return g_tile_manager.Pointer();
-}
-
-void GlobalTileManager::Remove(Key key) {
-  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
-  DCHECK(mru_list_.end() != key);
-
-  total_allocated_tiles_ -= (*key)->GetNumTiles();
-  mru_list_.erase(key);
-  DCHECK(IsConsistent());
-}
-
-size_t GlobalTileManager::Evict(size_t desired_num_tiles, Key key) {
-  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
-  size_t total_evicted_tiles = 0;
-
-  // Evicts from the least recent drawn view, until the disired number of tiles
-  // can be reclaimed, or until we've evicted all inactive views.
-  ListType::reverse_iterator it;
-  for (it = mru_list_.rbegin(); it != mru_list_.rend(); it++) {
-    // key represents the view that requested the eviction, so we don't need to
-    // evict the requester itself. And we only evict the inactive views,
-    // which are all the views after the requester.
-    if (*it == *key)
-      break;
-
-    size_t evicted_tiles = (*it)->GetNumTiles();
-    (*it)->SetNumTiles(0, true);
-
-    total_evicted_tiles += evicted_tiles;
-    if (total_evicted_tiles >= desired_num_tiles)
-      break;
-  }
-
-  return total_evicted_tiles;
-}
-
-void GlobalTileManager::SetTileLimit(size_t num_tiles_limit) {
-  num_tiles_limit_ = num_tiles_limit;
-}
-
-void GlobalTileManager::RequestTiles(size_t new_num_of_tiles, Key key) {
-  DCHECK(IsConsistent());
-  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
-  size_t old_num_of_tiles = (*key)->GetNumTiles();
-  size_t num_of_active_views = std::distance(mru_list_.begin(), key) + 1;
-  size_t tiles_per_view_limit;
-  if (num_of_active_views == 0)
-    tiles_per_view_limit = num_tiles_limit_;
-  else
-    tiles_per_view_limit = num_tiles_limit_ / num_of_active_views;
-  new_num_of_tiles = std::min(new_num_of_tiles, tiles_per_view_limit);
-  size_t new_total_allocated_tiles =
-      total_allocated_tiles_ - old_num_of_tiles + new_num_of_tiles;
-  // Has enough tiles to satisfy the request.
-  if (new_total_allocated_tiles <= num_tiles_limit_) {
-    total_allocated_tiles_ = new_total_allocated_tiles;
-    (*key)->SetNumTiles(new_num_of_tiles, false);
-    return;
-  }
-
-  // Does not have enough tiles. Now evict other clients' tiles.
-  size_t tiles_left = num_tiles_limit_ - total_allocated_tiles_;
-
-  size_t evicted_tiles =
-      Evict(new_total_allocated_tiles - num_tiles_limit_, key);
-  if (evicted_tiles >= new_total_allocated_tiles - num_tiles_limit_) {
-    new_total_allocated_tiles -= evicted_tiles;
-    total_allocated_tiles_ = new_total_allocated_tiles;
-    (*key)->SetNumTiles(new_num_of_tiles, false);
-    return;
-  } else {
-    total_allocated_tiles_ = num_tiles_limit_;
-    (*key)->SetNumTiles(tiles_left + old_num_of_tiles + evicted_tiles, false);
-    return;
-  }
-}
-
-GlobalTileManager::Key GlobalTileManager::PushBack(
-    GlobalTileManagerClient* client) {
-  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
-  DCHECK(mru_list_.end() ==
-         std::find(mru_list_.begin(), mru_list_.end(), client));
-  mru_list_.push_back(client);
-  Key back = mru_list_.end();
-  back--;
-  return back;
-}
-
-void GlobalTileManager::DidUse(Key key) {
-  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
-  DCHECK(mru_list_.end() != key);
-
-  mru_list_.splice(mru_list_.begin(), mru_list_, key);
-}
-
-GlobalTileManager::GlobalTileManager()
-    : num_tiles_limit_(kNumTilesLimit), total_allocated_tiles_(0) {
-}
-
-GlobalTileManager::~GlobalTileManager() {
-}
-
-bool GlobalTileManager::IsConsistent() const {
-  size_t total_tiles = 0;
-  ListType::const_iterator it;
-  for (it = mru_list_.begin(); it != mru_list_.end(); it++) {
-    total_tiles += (*it)->GetNumTiles();
-  }
-
-  bool is_consistent = (total_tiles <= num_tiles_limit_ &&
-                        total_tiles == total_allocated_tiles_);
-
-  return is_consistent;
-}
-
-}  // namespace webview
diff --git a/android_webview/browser/global_tile_manager.h b/android_webview/browser/global_tile_manager.h
deleted file mode 100644
index a4b976b..0000000
--- a/android_webview/browser/global_tile_manager.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_GLOBAL_TILE_MANAGER_H_
-#define ANDROID_WEBVIEW_BROWSER_GLOBAL_TILE_MANAGER_H_
-
-#include <list>
-#include "base/basictypes.h"
-#include "base/lazy_instance.h"
-#include "base/sequence_checker.h"
-#include "base/synchronization/lock.h"
-
-namespace android_webview {
-
-class GlobalTileManagerClient;
-
-// A global tile manager that keeps track of the number of tile resources. Each
-// tile needs file descriptors (typically 2) and there is a soft limit of 1024
-// file descriptors per Android process. The GlobalTileManager does not keep
-// track of how many tiles each individual view is actually using. The purpose
-// of GlobalTileManager is to behave gracefully (as in not crashing) when the
-// embedder of webview creates a lot of webviews and draw them at the same time.
-class GlobalTileManager {
- private:
-  typedef std::list<GlobalTileManagerClient*> ListType;
-
- public:
-  typedef ListType::iterator Key;
-  static GlobalTileManager* GetInstance();
-
-  void SetTileLimit(size_t num_tiles_limit);
-
-  // Requests the |new_num_of_tiles| from the available global pool. Calls
-  // GlobalTileManagerClient.SetNumTiles after the manager determines how many
-  // tiles are available for the client. If the number of tiles left is not
-  // enough to satisfy the request, the manager will evict tiles allocated to
-  // other clients.
-  void RequestTiles(size_t new_num_of_tiles, Key key);
-
-  Key PushBack(GlobalTileManagerClient* client);
-
-  // |key| must be already in manager. Move the tile manager client
-  // corresponding to |key| to most recent. This function should be called after
-  // RequestTiles.
-  void DidUse(Key key);
-
-  void Remove(Key key);
-
- private:
-  friend struct base::DefaultLazyInstanceTraits<GlobalTileManager>;
-  GlobalTileManager();
-  ~GlobalTileManager();
-
-  // Continues evicting the inactive views until freeing up at least amount of
-  // tiles specified by |desired_num_tiles| to draw a view specified by |key|,
-  // or until all inactive views have been evicted. Returns the amount of
-  // memory that was actually evicted. This function is called when a
-  // request cannot be satisfied.
-  size_t Evict(size_t desired_num_tiles, Key key);
-
-  // Check that the sum of all client's tiles is equal to
-  // total_allocated_tiles_.
-  bool IsConsistent() const;
-
-  size_t num_tiles_limit_;
-
-  size_t total_allocated_tiles_;
-  ListType mru_list_;
-  base::SequenceChecker sequence_checker_;
-
-  DISALLOW_COPY_AND_ASSIGN(GlobalTileManager);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_GLOBAL_TILE_MANAGER_H_
diff --git a/android_webview/browser/global_tile_manager_client.h b/android_webview/browser/global_tile_manager_client.h
deleted file mode 100644
index ec4dad6..0000000
--- a/android_webview/browser/global_tile_manager_client.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_GLOBAL_TILE_MANAGER_CLIENT_H_
-#define ANDROID_WEBVIEW_BROWSER_GLOBAL_TILE_MANAGER_CLIENT_H_
-
-namespace android_webview {
-// GlobalTileManagerClient requests tile resources from GlobalTileManager.
-class GlobalTileManagerClient {
- public:
-  // Get the number of tiles allocated to the client.
-  virtual size_t GetNumTiles() const = 0;
-
-  // Set the number of tiles allocated to the client. When
-  // |effective_immediately| is true, the client will enforce its tile policy
-  // immediately.
-  virtual void SetNumTiles(size_t num_tiles, bool effective_immediately) = 0;
-
- protected:
-  virtual ~GlobalTileManagerClient() {}
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_GLOBAL_TILE_MANAGER_CLIENT_H_
diff --git a/android_webview/browser/global_tile_manager_unittest.cc b/android_webview/browser/global_tile_manager_unittest.cc
deleted file mode 100644
index bd96889..0000000
--- a/android_webview/browser/global_tile_manager_unittest.cc
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2014 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.
-
-#include <algorithm>
-#include "android_webview/browser/global_tile_manager.h"
-#include "android_webview/browser/global_tile_manager_client.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace {
-// This should be the same as the one defined global_tile_manager.cc
-const size_t kNumTilesLimit = 450;
-const size_t kDefaultNumTiles = 150;
-
-}  // namespace
-
-using android_webview::GlobalTileManager;
-using android_webview::GlobalTileManagerClient;
-using testing::Test;
-
-class MockGlobalTileManagerClient : public GlobalTileManagerClient {
- public:
-  virtual size_t GetNumTiles() const OVERRIDE { return num_tiles_; }
-  virtual void SetNumTiles(size_t num_tiles,
-                           bool effective_immediately) OVERRIDE {
-    num_tiles_ = num_tiles;
-  }
-
-  MockGlobalTileManagerClient() {
-    num_tiles_ = 0;
-    tile_request_ = kDefaultNumTiles;
-    key_ = GlobalTileManager::GetInstance()->PushBack(this);
-  }
-
-  virtual ~MockGlobalTileManagerClient() {
-    GlobalTileManager::GetInstance()->Remove(key_);
-  }
-
-  size_t GetTileRequest() { return tile_request_; }
-  GlobalTileManager::Key GetKey() { return key_; }
-
- private:
-  size_t num_tiles_;
-  size_t tile_request_;
-  GlobalTileManager::Key key_;
-};
-
-class GlobalTileManagerTest : public Test {
- public:
-  virtual void SetUp() {}
-
-  GlobalTileManager* manager() { return GlobalTileManager::GetInstance(); }
-};
-
-TEST_F(GlobalTileManagerTest, RequestTilesUnderLimit) {
-  MockGlobalTileManagerClient clients[2];
-
-  for (size_t i = 0; i < 2; i++) {
-    manager()->RequestTiles(clients[i].GetTileRequest(), clients[i].GetKey());
-    manager()->DidUse(clients[i].GetKey());
-
-    // Ensure clients get what they asked for when the manager is under tile
-    // limit.
-    EXPECT_EQ(clients[i].GetNumTiles(), kDefaultNumTiles);
-  }
-}
-
-TEST_F(GlobalTileManagerTest, EvictHappensWhenOverLimit) {
-  MockGlobalTileManagerClient clients[4];
-
-  for (size_t i = 0; i < 4; i++) {
-    manager()->RequestTiles(clients[i].GetTileRequest(), clients[i].GetKey());
-    manager()->DidUse(clients[i].GetKey());
-  }
-
-  size_t total_tiles = 0;
-  for (size_t i = 0; i < 4; i++) {
-    total_tiles += clients[i].GetNumTiles();
-  }
-
-  // Ensure that eviction happened and kept the total number of tiles within
-  // kNumTilesLimit.
-  EXPECT_LE(total_tiles, kNumTilesLimit);
-}
-
-TEST_F(GlobalTileManagerTest, RandomizedStressRequests) {
-  MockGlobalTileManagerClient clients[100];
-  size_t index[100];
-  for (size_t i = 0; i < 100; i++) {
-    index[i] = i;
-  }
-
-  // Fix the seed so that tests are reproducible.
-  std::srand(1);
-  // Simulate a random request order of clients.
-  std::random_shuffle(&index[0], &index[99]);
-
-  for (size_t i = 0; i < 100; i++) {
-    size_t j = index[i];
-    manager()->RequestTiles(clients[j].GetTileRequest(), clients[j].GetKey());
-    manager()->DidUse(clients[j].GetKey());
-  }
-
-  size_t total_tiles = 0;
-  for (size_t i = 0; i < 100; i++) {
-    total_tiles += clients[i].GetNumTiles();
-  }
-
-  // Ensure that eviction happened and kept the total number of tiles within
-  // kNumTilesLimit.
-  EXPECT_LE(total_tiles, kNumTilesLimit);
-}
-
-TEST_F(GlobalTileManagerTest, FixedOrderedRequests) {
-  MockGlobalTileManagerClient clients[10];
-
-  // 10 clients requesting resources in a fixed order. Do that for 5 rounds.
-  for (int round = 0; round < 5; round++) {
-    for (size_t i = 0; i < 10; i++) {
-      manager()->RequestTiles(clients[i].GetTileRequest(), clients[i].GetKey());
-      manager()->DidUse(clients[i].GetKey());
-    }
-  }
-
-  // Ensure that the total tiles are divided evenly among all clients.
-  for (size_t i = 0; i < 10; i++) {
-    EXPECT_EQ(clients[i].GetNumTiles(), kNumTilesLimit / 10);
-  }
-}
-
-TEST_F(GlobalTileManagerTest, FixedOrderedRequestsWithInactiveClients) {
-  MockGlobalTileManagerClient clients[20];
-
-  // 20 clients request resources.
-  for (size_t i = 0; i < 20; i++) {
-    manager()->RequestTiles(clients[i].GetTileRequest(), clients[i].GetKey());
-    manager()->DidUse(clients[i].GetKey());
-  }
-
-  // Now the last 10 clients become inactive. Only the first 10 clients remain
-  // active resource requesters.
-  // 10 clients requesting resources in a fixed order. Do that for 5 rounds.
-  for (int round = 0; round < 5; round++) {
-    for (size_t i = 0; i < 10; i++) {
-      manager()->RequestTiles(clients[i].GetTileRequest(), clients[i].GetKey());
-      manager()->DidUse(clients[i].GetKey());
-    }
-  }
-
-  // Ensure that the total tiles are divided evenly among all clients.
-  for (size_t i = 0; i < 10; i++) {
-    EXPECT_EQ(clients[i].GetNumTiles(), kNumTilesLimit / 10);
-  }
-
-  // Ensure that the inactive tiles are evicted.
-  for (size_t i = 11; i < 20; i++) {
-    EXPECT_EQ(clients[i].GetNumTiles(), 0u);
-  }
-}
diff --git a/android_webview/browser/gpu_memory_buffer_factory_impl.cc b/android_webview/browser/gpu_memory_buffer_factory_impl.cc
deleted file mode 100644
index 63771c6..0000000
--- a/android_webview/browser/gpu_memory_buffer_factory_impl.cc
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2013 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.
-
-#include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
-
-#include "android_webview/public/browser/draw_gl.h"
-#include "base/logging.h"
-#include "gpu/command_buffer/service/in_process_command_buffer.h"
-#include "ui/gfx/gpu_memory_buffer.h"
-#include "ui/gfx/size.h"
-#include "ui/gl/gl_bindings.h"
-#include "ui/gl/gl_image_android_native_buffer.h"
-
-namespace android_webview {
-
-namespace {
-
-// Provides hardware rendering functions from the Android glue layer.
-AwDrawGLFunctionTable* g_gl_draw_functions = NULL;
-
-class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
- public:
-  GpuMemoryBufferImpl(long buffer_id, const gfx::Size& size)
-      : buffer_id_(buffer_id), size_(size), mapped_(false) {
-    DCHECK(buffer_id_);
-  }
-
-  virtual ~GpuMemoryBufferImpl() {
-    g_gl_draw_functions->release_graphic_buffer(buffer_id_);
-  }
-
-  // Overridden from gfx::GpuMemoryBuffer:
-  virtual void* Map() OVERRIDE {
-    void* vaddr = NULL;
-    int err = g_gl_draw_functions->map(buffer_id_, MAP_READ_WRITE, &vaddr);
-    DCHECK(!err);
-    mapped_ = true;
-    return vaddr;
-  }
-  virtual void Unmap() OVERRIDE {
-    int err = g_gl_draw_functions->unmap(buffer_id_);
-    DCHECK(!err);
-    mapped_ = false;
-  }
-  virtual bool IsMapped() const OVERRIDE { return mapped_; }
-  virtual uint32 GetStride() const OVERRIDE {
-    return g_gl_draw_functions->get_stride(buffer_id_);
-  }
-  virtual gfx::GpuMemoryBufferHandle GetHandle() const OVERRIDE {
-    gfx::GpuMemoryBufferHandle handle;
-    handle.type = gfx::ANDROID_NATIVE_BUFFER;
-    handle.buffer_id = buffer_id_;
-    return handle;
-  }
-
- private:
-  long buffer_id_;
-  gfx::Size size_;
-  bool mapped_;
-
-  DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferImpl);
-};
-
-}  // namespace
-
-GpuMemoryBufferFactoryImpl::GpuMemoryBufferFactoryImpl() {
-}
-
-GpuMemoryBufferFactoryImpl::~GpuMemoryBufferFactoryImpl() {
-}
-
-scoped_ptr<gfx::GpuMemoryBuffer>
-GpuMemoryBufferFactoryImpl::AllocateGpuMemoryBuffer(size_t width,
-                                                    size_t height,
-                                                    unsigned internalformat,
-                                                    unsigned usage) {
-  // For Android WebView we assume the |internalformat| will always be
-  // GL_RGBA8_OES.
-  CHECK_EQ(static_cast<GLenum>(GL_RGBA8_OES), internalformat);
-  CHECK(g_gl_draw_functions);
-  long buffer_id = g_gl_draw_functions->create_graphic_buffer(width, height);
-  if (!buffer_id)
-    return scoped_ptr<gfx::GpuMemoryBuffer>();
-
-  return make_scoped_ptr(
-             new GpuMemoryBufferImpl(buffer_id, gfx::Size(width, height)))
-      .PassAs<gfx::GpuMemoryBuffer>();
-}
-
-scoped_refptr<gfx::GLImage>
-GpuMemoryBufferFactoryImpl::CreateImageForGpuMemoryBuffer(
-    const gfx::GpuMemoryBufferHandle& handle,
-    const gfx::Size& size,
-    unsigned internalformat) {
-  DCHECK_EQ(gfx::ANDROID_NATIVE_BUFFER, handle.type);
-
-  EGLClientBuffer native_buffer =
-      g_gl_draw_functions->get_native_buffer(handle.buffer_id);
-  DCHECK(native_buffer);
-
-  scoped_refptr<gfx::GLImageAndroidNativeBuffer> image(
-      new gfx::GLImageAndroidNativeBuffer(size));
-  if (!image->Initialize(native_buffer))
-    return scoped_refptr<gfx::GLImage>();
-
-  return image;
-}
-
-// static
-void GpuMemoryBufferFactoryImpl::SetAwDrawGLFunctionTable(
-    AwDrawGLFunctionTable* table) {
-  g_gl_draw_functions = table;
-}
-
-bool GpuMemoryBufferFactoryImpl::Initialize() {
-  if (!g_gl_draw_functions)
-    return false;
-
-  gpu::InProcessCommandBuffer::SetGpuMemoryBufferFactory(this);
-  return true;
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/gpu_memory_buffer_factory_impl.h b/android_webview/browser/gpu_memory_buffer_factory_impl.h
deleted file mode 100644
index 16c8ffaa..0000000
--- a/android_webview/browser/gpu_memory_buffer_factory_impl.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2013 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_GPU_MEMORY_BUFFER_FACTORY_IMPL_H_
-#define ANDROID_WEBVIEW_BROWSER_GPU_MEMORY_BUFFER_FACTORY_IMPL_H_
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "gpu/command_buffer/service/in_process_command_buffer.h"
-
-struct AwDrawGLFunctionTable;
-
-namespace android_webview {
-
-class GpuMemoryBufferFactoryImpl : public gpu::InProcessGpuMemoryBufferFactory {
- public:
-  GpuMemoryBufferFactoryImpl();
-  virtual ~GpuMemoryBufferFactoryImpl();
-
-  static void SetAwDrawGLFunctionTable(AwDrawGLFunctionTable* table);
-  bool Initialize();
-
-  // Overridden from gpu::InProcessGpuMemoryBufferFactory:
-  virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
-      size_t width,
-      size_t height,
-      unsigned internalformat,
-      unsigned usage) OVERRIDE;
-  virtual scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(
-      const gfx::GpuMemoryBufferHandle& handle,
-      const gfx::Size& size,
-      unsigned internalformat) OVERRIDE;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferFactoryImpl);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_GPU_MEMORY_BUFFER_FACTORY_IMPL_H_
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc
deleted file mode 100644
index 687de8b..0000000
--- a/android_webview/browser/hardware_renderer.cc
+++ /dev/null
@@ -1,255 +0,0 @@
-// Copyright 2014 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.
-
-#include "android_webview/browser/hardware_renderer.h"
-
-#include "android_webview/browser/aw_gl_surface.h"
-#include "android_webview/browser/deferred_gpu_command_service.h"
-#include "android_webview/browser/parent_output_surface.h"
-#include "android_webview/browser/shared_renderer_state.h"
-#include "android_webview/public/browser/draw_gl.h"
-#include "base/auto_reset.h"
-#include "base/debug/trace_event.h"
-#include "base/strings/string_number_conversions.h"
-#include "cc/layers/delegated_frame_provider.h"
-#include "cc/layers/delegated_renderer_layer.h"
-#include "cc/layers/layer.h"
-#include "cc/output/compositor_frame.h"
-#include "cc/output/output_surface.h"
-#include "cc/trees/layer_tree_host.h"
-#include "cc/trees/layer_tree_settings.h"
-#include "gpu/command_buffer/client/gl_in_process_context.h"
-#include "gpu/command_buffer/common/gles2_cmd_utils.h"
-#include "ui/gfx/frame_time.h"
-#include "ui/gfx/geometry/rect_conversions.h"
-#include "ui/gfx/geometry/rect_f.h"
-#include "ui/gfx/transform.h"
-#include "ui/gl/gl_bindings.h"
-#include "webkit/common/gpu/context_provider_in_process.h"
-#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
-
-namespace android_webview {
-
-namespace {
-
-using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
-using webkit::gpu::WebGraphicsContext3DImpl;
-
-scoped_refptr<cc::ContextProvider> CreateContext(
-    scoped_refptr<gfx::GLSurface> surface,
-    scoped_refptr<gpu::InProcessCommandBuffer::Service> service) {
-  const gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
-
-  blink::WebGraphicsContext3D::Attributes attributes;
-  attributes.antialias = false;
-  attributes.depth = false;
-  attributes.stencil = false;
-  attributes.shareResources = true;
-  attributes.noAutomaticFlushes = true;
-  gpu::gles2::ContextCreationAttribHelper attribs_for_gles2;
-  WebGraphicsContext3DImpl::ConvertAttributes(
-      attributes, &attribs_for_gles2);
-  attribs_for_gles2.lose_context_when_out_of_memory = true;
-
-  scoped_ptr<gpu::GLInProcessContext> context(gpu::GLInProcessContext::Create(
-      service,
-      surface,
-      surface->IsOffscreen(),
-      gfx::kNullAcceleratedWidget,
-      surface->GetSize(),
-      NULL /* share_context */,
-      false /* share_resources */,
-      attribs_for_gles2,
-      gpu_preference,
-      gpu::GLInProcessContextSharedMemoryLimits()));
-  DCHECK(context.get());
-
-  return webkit::gpu::ContextProviderInProcess::Create(
-      WebGraphicsContext3DInProcessCommandBufferImpl::WrapContext(
-          context.Pass(), attributes),
-      "Parent-Compositor");
-}
-
-}  // namespace
-
-HardwareRenderer::HardwareRenderer(SharedRendererState* state)
-    : shared_renderer_state_(state),
-      last_egl_context_(eglGetCurrentContext()),
-      stencil_enabled_(false),
-      viewport_clip_valid_for_dcheck_(false),
-      gl_surface_(new AwGLSurface),
-      root_layer_(cc::Layer::Create()),
-      resource_collection_(new cc::DelegatedFrameResourceCollection),
-      output_surface_(NULL) {
-  DCHECK(last_egl_context_);
-
-  resource_collection_->SetClient(this);
-
-  cc::LayerTreeSettings settings;
-
-  // Should be kept in sync with compositor_impl_android.cc.
-  settings.allow_antialiasing = false;
-  settings.highp_threshold_min = 2048;
-
-  // Webview does not own the surface so should not clear it.
-  settings.should_clear_root_render_pass = false;
-
-  // TODO(enne): Update this this compositor to use a synchronous scheduler.
-  settings.single_thread_proxy_scheduler = false;
-
-  layer_tree_host_ =
-      cc::LayerTreeHost::CreateSingleThreaded(this, this, NULL, settings, NULL);
-  layer_tree_host_->SetRootLayer(root_layer_);
-  layer_tree_host_->SetLayerTreeHostClientReady();
-  layer_tree_host_->set_has_transparent_background(true);
-}
-
-HardwareRenderer::~HardwareRenderer() {
-  // Must reset everything before |resource_collection_| to ensure all
-  // resources are returned before resetting |resource_collection_| client.
-  layer_tree_host_.reset();
-  root_layer_ = NULL;
-  delegated_layer_ = NULL;
-  frame_provider_ = NULL;
-#if DCHECK_IS_ON
-  // Check collection is empty.
-  cc::ReturnedResourceArray returned_resources;
-  resource_collection_->TakeUnusedResourcesForChildCompositor(
-      &returned_resources);
-  DCHECK_EQ(0u, returned_resources.size());
-#endif  // DCHECK_IS_ON
-
-  resource_collection_->SetClient(NULL);
-
-  // Reset draw constraints.
-  shared_renderer_state_->UpdateDrawConstraints(
-      ParentCompositorDrawConstraints());
-}
-
-void HardwareRenderer::DidBeginMainFrame() {
-  // This is called after OutputSurface is created, but before the impl frame
-  // starts. We set the draw constraints here.
-  DCHECK(output_surface_);
-  DCHECK(viewport_clip_valid_for_dcheck_);
-  output_surface_->SetExternalStencilTest(stencil_enabled_);
-  output_surface_->SetDrawConstraints(viewport_, clip_);
-}
-
-void HardwareRenderer::CommitFrame() {
-  scoped_ptr<DrawGLInput> input = shared_renderer_state_->PassDrawGLInput();
-  // Happens with empty global visible rect.
-  if (!input.get())
-    return;
-
-  DCHECK(!input->frame.gl_frame_data);
-  DCHECK(!input->frame.software_frame_data);
-
-  // DelegatedRendererLayerImpl applies the inverse device_scale_factor of the
-  // renderer frame, assuming that the browser compositor will scale
-  // it back up to device scale.  But on Android we put our browser layers in
-  // physical pixels and set our browser CC device_scale_factor to 1, so this
-  // suppresses the transform.
-  input->frame.delegated_frame_data->device_scale_factor = 1.0f;
-
-  gfx::Size frame_size =
-      input->frame.delegated_frame_data->render_pass_list.back()
-          ->output_rect.size();
-  bool size_changed = frame_size != frame_size_;
-  frame_size_ = frame_size;
-  scroll_offset_ = input->scroll_offset;
-
-  if (!frame_provider_ || size_changed) {
-    if (delegated_layer_) {
-      delegated_layer_->RemoveFromParent();
-    }
-
-    frame_provider_ = new cc::DelegatedFrameProvider(
-        resource_collection_.get(), input->frame.delegated_frame_data.Pass());
-
-    delegated_layer_ = cc::DelegatedRendererLayer::Create(frame_provider_);
-    delegated_layer_->SetBounds(gfx::Size(input->width, input->height));
-    delegated_layer_->SetIsDrawable(true);
-
-    root_layer_->AddChild(delegated_layer_);
-  } else {
-    frame_provider_->SetFrameData(input->frame.delegated_frame_data.Pass());
-  }
-}
-
-void HardwareRenderer::DrawGL(bool stencil_enabled,
-                              int framebuffer_binding_ext,
-                              AwDrawGLInfo* draw_info) {
-  TRACE_EVENT0("android_webview", "HardwareRenderer::DrawGL");
-
-  // We need to watch if the current Android context has changed and enforce
-  // a clean-up in the compositor.
-  EGLContext current_context = eglGetCurrentContext();
-  if (!current_context) {
-    DLOG(ERROR) << "DrawGL called without EGLContext";
-    return;
-  }
-
-  // TODO(boliu): Handle context loss.
-  if (last_egl_context_ != current_context)
-    DLOG(WARNING) << "EGLContextChanged";
-
-  gfx::Transform transform(gfx::Transform::kSkipInitialization);
-  transform.matrix().setColMajorf(draw_info->transform);
-  transform.Translate(scroll_offset_.x(), scroll_offset_.y());
-
-  // Need to post the new transform matrix back to child compositor
-  // because there is no onDraw during a Render Thread animation, and child
-  // compositor might not have the tiles rasterized as the animation goes on.
-  ParentCompositorDrawConstraints draw_constraints(
-      draw_info->is_layer, transform, gfx::Rect(viewport_));
-  if (!draw_constraints_.Equals(draw_constraints)) {
-    draw_constraints_ = draw_constraints;
-    shared_renderer_state_->PostExternalDrawConstraintsToChildCompositor(
-        draw_constraints);
-  }
-
-  if (!delegated_layer_.get())
-    return;
-
-  viewport_.SetSize(draw_info->width, draw_info->height);
-  layer_tree_host_->SetViewportSize(viewport_);
-  clip_.SetRect(draw_info->clip_left,
-                draw_info->clip_top,
-                draw_info->clip_right - draw_info->clip_left,
-                draw_info->clip_bottom - draw_info->clip_top);
-  stencil_enabled_ = stencil_enabled;
-
-  delegated_layer_->SetTransform(transform);
-
-  gl_surface_->SetBackingFrameBufferObject(framebuffer_binding_ext);
-  {
-    base::AutoReset<bool> frame_resetter(&viewport_clip_valid_for_dcheck_,
-                                         true);
-    layer_tree_host_->SetNeedsRedrawRect(clip_);
-    layer_tree_host_->Composite(gfx::FrameTime::Now());
-  }
-  gl_surface_->ResetBackingFrameBufferObject();
-}
-
-scoped_ptr<cc::OutputSurface> HardwareRenderer::CreateOutputSurface(
-    bool fallback) {
-  // Android webview does not support losing output surface.
-  DCHECK(!fallback);
-  scoped_refptr<cc::ContextProvider> context_provider =
-      CreateContext(gl_surface_,
-                    DeferredGpuCommandService::GetInstance());
-  scoped_ptr<ParentOutputSurface> output_surface_holder(
-      new ParentOutputSurface(context_provider));
-  output_surface_ = output_surface_holder.get();
-  return output_surface_holder.PassAs<cc::OutputSurface>();
-}
-
-void HardwareRenderer::UnusedResourcesAreAvailable() {
-  cc::ReturnedResourceArray returned_resources;
-  resource_collection_->TakeUnusedResourcesForChildCompositor(
-      &returned_resources);
-  shared_renderer_state_->InsertReturnedResources(returned_resources);
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/hardware_renderer.h b/android_webview/browser/hardware_renderer.h
deleted file mode 100644
index 5091491..0000000
--- a/android_webview/browser/hardware_renderer.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
-#define ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
-
-#include "android_webview/browser/parent_compositor_draw_constraints.h"
-#include "android_webview/browser/shared_renderer_state.h"
-#include "base/memory/scoped_ptr.h"
-#include "cc/layers/delegated_frame_resource_collection.h"
-#include "cc/trees/layer_tree_host_client.h"
-#include "cc/trees/layer_tree_host_single_thread_client.h"
-
-struct AwDrawGLInfo;
-
-namespace cc {
-class DelegatedFrameProvider;
-class DelegatedRendererLayer;
-class Layer;
-class LayerTreeHost;
-}
-
-namespace android_webview {
-
-class AwGLSurface;
-class ParentOutputSurface;
-
-class HardwareRenderer : public cc::LayerTreeHostClient,
-                         public cc::LayerTreeHostSingleThreadClient,
-                         public cc::DelegatedFrameResourceCollectionClient {
- public:
-  explicit HardwareRenderer(SharedRendererState* state);
-  virtual ~HardwareRenderer();
-
-  void DrawGL(bool stencil_enabled,
-              int framebuffer_binding_ext,
-              AwDrawGLInfo* draw_info);
-  void CommitFrame();
-
-  // cc::LayerTreeHostClient overrides.
-  virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
-  virtual void DidBeginMainFrame() OVERRIDE;
-  virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE {}
-  virtual void Layout() OVERRIDE {}
-  virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
-                                   float page_scale,
-                                   float top_controls_delta) OVERRIDE {}
-  virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(
-      bool fallback) OVERRIDE;
-  virtual void DidInitializeOutputSurface() OVERRIDE {}
-  virtual void WillCommit() OVERRIDE {}
-  virtual void DidCommit() OVERRIDE {}
-  virtual void DidCommitAndDrawFrame() OVERRIDE {}
-  virtual void DidCompleteSwapBuffers() OVERRIDE {}
-
-  // cc::LayerTreeHostSingleThreadClient overrides.
-  virtual void DidPostSwapBuffers() OVERRIDE {}
-  virtual void DidAbortSwapBuffers() OVERRIDE {}
-
-  // cc::DelegatedFrameResourceCollectionClient overrides.
-  virtual void UnusedResourcesAreAvailable() OVERRIDE;
-
- private:
-  SharedRendererState* shared_renderer_state_;
-
-  typedef void* EGLContext;
-  EGLContext last_egl_context_;
-
-  // Information about last delegated frame.
-  gfx::Size frame_size_;
-  gfx::Vector2d scroll_offset_;
-
-  // Information from draw.
-  gfx::Size viewport_;
-  gfx::Rect clip_;
-  bool stencil_enabled_;
-  bool viewport_clip_valid_for_dcheck_;
-
-  scoped_refptr<AwGLSurface> gl_surface_;
-
-  scoped_ptr<cc::LayerTreeHost> layer_tree_host_;
-  scoped_refptr<cc::Layer> root_layer_;
-
-  scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_;
-  scoped_refptr<cc::DelegatedFrameProvider> frame_provider_;
-  scoped_refptr<cc::DelegatedRendererLayer> delegated_layer_;
-
-  // This is owned indirectly by |layer_tree_host_|.
-  ParentOutputSurface* output_surface_;
-
-  ParentCompositorDrawConstraints draw_constraints_;
-
-  DISALLOW_COPY_AND_ASSIGN(HardwareRenderer);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
diff --git a/android_webview/browser/icon_helper.cc b/android_webview/browser/icon_helper.cc
deleted file mode 100644
index 8922a7e..0000000
--- a/android_webview/browser/icon_helper.cc
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) 2013 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.
-
-#include "android_webview/browser/icon_helper.h"
-
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/hash.h"
-#include "base/logging.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/common/favicon_url.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/gfx/size.h"
-
-using content::BrowserThread;
-using content::WebContents;
-
-namespace android_webview {
-
-IconHelper::IconHelper(WebContents* web_contents)
-    : WebContentsObserver(web_contents),
-      listener_(NULL),
-      missing_favicon_urls_() {
-}
-
-IconHelper::~IconHelper() {
-}
-
-void IconHelper::SetListener(Listener* listener) {
-  listener_ = listener;
-}
-
-void IconHelper::DownloadFaviconCallback(
-    int id,
-    int http_status_code,
-    const GURL& image_url,
-    const std::vector<SkBitmap>& bitmaps,
-    const std::vector<gfx::Size>& original_bitmap_sizes) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (http_status_code == 404) {
-    MarkUnableToDownloadFavicon(image_url);
-    return;
-  }
-
-  if (bitmaps.size() == 0) {
-    return;
-  }
-
-  // We can protentially have multiple frames of the icon
-  // in different sizes. We need more fine grain API spec
-  // to let clients pick out the frame they want.
-
-  // TODO(acleung): Pick the best icon to return based on size.
-  if (listener_)
-    listener_->OnReceivedIcon(image_url, bitmaps[0]);
-}
-
-void IconHelper::DidUpdateFaviconURL(
-    const std::vector<content::FaviconURL>& candidates) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  for (std::vector<content::FaviconURL>::const_iterator i = candidates.begin();
-       i != candidates.end(); ++i) {
-    if (!i->icon_url.is_valid())
-      continue;
-
-    switch(i->icon_type) {
-      case content::FaviconURL::FAVICON:
-        if ((listener_ && !listener_->ShouldDownloadFavicon(i->icon_url)) ||
-            WasUnableToDownloadFavicon(i->icon_url)) {
-          break;
-        }
-        web_contents()->DownloadImage(i->icon_url,
-            true,  // Is a favicon
-            0,  // No maximum size
-            base::Bind(
-                &IconHelper::DownloadFaviconCallback, base::Unretained(this)));
-        break;
-      case content::FaviconURL::TOUCH_ICON:
-        if (listener_)
-          listener_->OnReceivedTouchIconUrl(i->icon_url.spec(), false);
-        break;
-      case content::FaviconURL::TOUCH_PRECOMPOSED_ICON:
-        if (listener_)
-          listener_->OnReceivedTouchIconUrl(i->icon_url.spec(), true);
-        break;
-      case content::FaviconURL::INVALID_ICON:
-        // Silently ignore it. Only trigger a callback on valid icons.
-        break;
-      default:
-        NOTREACHED();
-        break;
-    }
-  }
-}
-
-void IconHelper::DidStartNavigationToPendingEntry(
-    const GURL& url,
-    content::NavigationController::ReloadType reload_type) {
-  if (reload_type == content::NavigationController::RELOAD_IGNORING_CACHE)
-    ClearUnableToDownloadFavicons();
-}
-
-void IconHelper::MarkUnableToDownloadFavicon(const GURL& icon_url) {
-  MissingFaviconURLHash url_hash = base::Hash(icon_url.spec());
-  missing_favicon_urls_.insert(url_hash);
-}
-
-bool IconHelper::WasUnableToDownloadFavicon(const GURL& icon_url) const {
-  MissingFaviconURLHash url_hash = base::Hash(icon_url.spec());
-  return missing_favicon_urls_.find(url_hash) != missing_favicon_urls_.end();
-}
-
-void IconHelper::ClearUnableToDownloadFavicons() {
-  missing_favicon_urls_.clear();
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/icon_helper.h b/android_webview/browser/icon_helper.h
deleted file mode 100644
index f325450..0000000
--- a/android_webview/browser/icon_helper.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) 2013 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_ICON_HELPER_H_
-#define ANDROID_WEBVIEW_BROWSER_ICON_HELPER_H_
-
-#include <string>
-#include "base/containers/hash_tables.h"
-#include "content/public/browser/web_contents_observer.h"
-#include "url/gurl.h"
-
-class SkBitmap;
-
-namespace content {
-struct FaviconURL;
-}
-
-namespace gfx {
-class Size;
-}
-
-namespace android_webview {
-
-// A helper that observes favicon changes for Webview.
-class IconHelper : public content::WebContentsObserver {
- public:
-  class Listener {
-   public:
-    virtual bool ShouldDownloadFavicon(const GURL& icon_url) = 0;
-    virtual void OnReceivedIcon(const GURL& icon_url,
-                                const SkBitmap& bitmap) = 0;
-    virtual void OnReceivedTouchIconUrl(const std::string& url,
-                                        const bool precomposed) = 0;
-   protected:
-    virtual ~Listener() {}
-  };
-
-  explicit IconHelper(content::WebContents* web_contents);
-  virtual ~IconHelper();
-
-  void SetListener(Listener* listener);
-
-  // From WebContentsObserver
-  virtual void DidUpdateFaviconURL(
-      const std::vector<content::FaviconURL>& candidates) OVERRIDE;
-  virtual void DidStartNavigationToPendingEntry(
-      const GURL& url,
-      content::NavigationController::ReloadType reload_type) OVERRIDE;
-
-  void DownloadFaviconCallback(
-      int id,
-      int http_status_code,
-      const GURL& image_url,
-      const std::vector<SkBitmap>& bitmaps,
-      const std::vector<gfx::Size>& original_bitmap_sizes);
-
- private:
-  void MarkUnableToDownloadFavicon(const GURL& icon_url);
-  bool WasUnableToDownloadFavicon(const GURL& icon_url) const;
-  void ClearUnableToDownloadFavicons();
-
-  Listener* listener_;
-
-  typedef uint32 MissingFaviconURLHash;
-  base::hash_set<MissingFaviconURLHash> missing_favicon_urls_;
-
-  DISALLOW_COPY_AND_ASSIGN(IconHelper);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_ICON_HELPER_H_
diff --git a/android_webview/browser/input_stream.h b/android_webview/browser/input_stream.h
deleted file mode 100644
index 9205a12..0000000
--- a/android_webview/browser/input_stream.h
+++ /dev/null
@@ -1,51 +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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_INPUT_STREAM_H_
-#define ANDROID_WEBVIEW_BROWSER_INPUT_STREAM_H_
-
-#include "base/basictypes.h"
-
-namespace net {
-class IOBuffer;
-}
-
-namespace android_webview {
-
-// Abstract wrapper used to access the InputStream Java class.
-// This class is safe to pass around between threads (the destructor,
-// constructor and methods can be called on different threads) but calling
-// methods concurrently might have undefined results.
-class InputStream {
- public:
-  virtual ~InputStream() {}
-
-  // Sets |bytes_available| to the number of bytes that can be read (or skipped
-  // over) from this input stream without blocking by the next caller of a
-  // method for this input stream.
-  // Returns true if completed successfully or false if an exception was
-  // thrown.
-  virtual bool BytesAvailable(int* bytes_available) const = 0;
-
-  // Skips over and discards |n| bytes of data from this input stream. Sets
-  // |bytes_skipped| to the number of of bytes skipped.
-  // Returns true if completed successfully or false if an exception was
-  // thrown.
-  virtual bool Skip(int64_t n, int64_t* bytes_skipped) = 0;
-
-  // Reads at most |length| bytes into |dest|. Sets |bytes_read| to the total
-  // number of bytes read into |dest| or 0 if there is no more data because the
-  // end of the stream was reached.
-  // |dest| must be at least |length| in size.
-  // Returns true if completed successfully or false if an exception was
-  // thrown.
-  virtual bool Read(net::IOBuffer* dest, int length, int* bytes_read) = 0;
-
- protected:
-  InputStream() {}
-};
-
-} // namespace android_webview
-
-#endif //  ANDROID_WEBVIEW_BROWSER_INPUT_STREAM_H_
diff --git a/android_webview/browser/jni_dependency_factory.h b/android_webview/browser/jni_dependency_factory.h
deleted file mode 100644
index 983ef2a..0000000
--- a/android_webview/browser/jni_dependency_factory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2013 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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_JNI_DEPENDENCY_FACTORY_H_
-#define ANDROID_WEBVIEW_BROWSER_JNI_DEPENDENCY_FACTORY_H_
-
-#include "base/memory/ref_counted.h"
-
-namespace content {
-class ExternalVideoSurfaceContainer;
-class WebContents;
-class WebContentsViewDelegate;
-}  // namespace content
-
-namespace android_webview {
-
-class AwBrowserContext;
-class AwQuotaManagerBridge;
-class AwWebPreferencesPopulater;
-
-// Used to create instances of objects under native that are used in browser.
-class JniDependencyFactory {
- public:
-  virtual ~JniDependencyFactory() {}
-
-  virtual scoped_refptr<AwQuotaManagerBridge> CreateAwQuotaManagerBridge(
-      AwBrowserContext* browser_context) = 0;
-  virtual content::WebContentsViewDelegate* CreateViewDelegate(
-      content::WebContents* web_contents) = 0;
-  virtual AwWebPreferencesPopulater* CreateWebPreferencesPopulater() = 0;
-#if defined(VIDEO_HOLE)
-  virtual content::ExternalVideoSurfaceContainer*
-      CreateExternalVideoSurfaceContainer(content::WebContents* contents) = 0;
-#endif
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_JNI_DEPENDENCY_FACTORY_H_
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job.cc b/android_webview/browser/net/android_stream_reader_url_request_job.cc
deleted file mode 100644
index 5af452e..0000000
--- a/android_webview/browser/net/android_stream_reader_url_request_job.cc
+++ /dev/null
@@ -1,371 +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.
-
-#include "android_webview/browser/net/android_stream_reader_url_request_job.h"
-
-#include <string>
-
-#include "android_webview/browser/input_stream.h"
-#include "android_webview/browser/net/input_stream_reader.h"
-#include "base/android/jni_android.h"
-#include "base/android/jni_string.h"
-#include "base/bind.h"
-#include "base/bind_helpers.h"
-#include "base/lazy_instance.h"
-#include "base/message_loop/message_loop.h"
-#include "base/message_loop/message_loop_proxy.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/task_runner.h"
-#include "base/threading/sequenced_worker_pool.h"
-#include "base/threading/thread.h"
-#include "content/public/browser/browser_thread.h"
-#include "net/base/io_buffer.h"
-#include "net/base/mime_util.h"
-#include "net/base/net_errors.h"
-#include "net/base/net_util.h"
-#include "net/http/http_response_headers.h"
-#include "net/http/http_response_info.h"
-#include "net/http/http_util.h"
-#include "net/url_request/url_request.h"
-#include "net/url_request/url_request_job_manager.h"
-
-using android_webview::InputStream;
-using android_webview::InputStreamReader;
-using base::android::AttachCurrentThread;
-using base::PostTaskAndReplyWithResult;
-using content::BrowserThread;
-
-namespace {
-
-const int kHTTPOk = 200;
-const int kHTTPNotFound = 404;
-
-const char kResponseHeaderViaShouldInterceptRequest[] =
-    "Client-Via: shouldInterceptRequest";
-const char kHTTPOkText[] = "OK";
-const char kHTTPNotFoundText[] = "Not Found";
-
-} // namespace
-
-// The requests posted to the worker thread might outlive the job.  Thread-safe
-// ref counting is used to ensure that the InputStream and InputStreamReader
-// members of this class are still there when the closure is run on the worker
-// thread.
-class InputStreamReaderWrapper :
-    public base::RefCountedThreadSafe<InputStreamReaderWrapper> {
- public:
-  InputStreamReaderWrapper(
-      scoped_ptr<InputStream> input_stream,
-      scoped_ptr<InputStreamReader> input_stream_reader)
-      : input_stream_(input_stream.Pass()),
-        input_stream_reader_(input_stream_reader.Pass()) {
-    DCHECK(input_stream_);
-    DCHECK(input_stream_reader_);
-  }
-
-  android_webview::InputStream* input_stream() {
-    return input_stream_.get();
-  }
-
-  int Seek(const net::HttpByteRange& byte_range) {
-    return input_stream_reader_->Seek(byte_range);
-  }
-
-  int ReadRawData(net::IOBuffer* buffer, int buffer_size) {
-    return input_stream_reader_->ReadRawData(buffer, buffer_size);
-  }
-
- private:
-  friend class base::RefCountedThreadSafe<InputStreamReaderWrapper>;
-  ~InputStreamReaderWrapper() {}
-
-  scoped_ptr<android_webview::InputStream> input_stream_;
-  scoped_ptr<android_webview::InputStreamReader> input_stream_reader_;
-
-  DISALLOW_COPY_AND_ASSIGN(InputStreamReaderWrapper);
-};
-
-AndroidStreamReaderURLRequestJob::AndroidStreamReaderURLRequestJob(
-    net::URLRequest* request,
-    net::NetworkDelegate* network_delegate,
-    scoped_ptr<Delegate> delegate)
-    : URLRequestJob(request, network_delegate),
-      delegate_(delegate.Pass()),
-      weak_factory_(this) {
-  DCHECK(delegate_);
-}
-
-AndroidStreamReaderURLRequestJob::~AndroidStreamReaderURLRequestJob() {
-}
-
-namespace {
-
-typedef base::Callback<
-    void(scoped_ptr<AndroidStreamReaderURLRequestJob::Delegate>,
-         scoped_ptr<InputStream>)> OnInputStreamOpenedCallback;
-
-// static
-void OpenInputStreamOnWorkerThread(
-    scoped_refptr<base::MessageLoopProxy> job_thread_proxy,
-    scoped_ptr<AndroidStreamReaderURLRequestJob::Delegate> delegate,
-    const GURL& url,
-    OnInputStreamOpenedCallback callback) {
-
-  JNIEnv* env = AttachCurrentThread();
-  DCHECK(env);
-
-  scoped_ptr<InputStream> input_stream = delegate->OpenInputStream(env, url);
-  job_thread_proxy->PostTask(FROM_HERE,
-                             base::Bind(callback,
-                                        base::Passed(delegate.Pass()),
-                                        base::Passed(input_stream.Pass())));
-}
-
-} // namespace
-
-void AndroidStreamReaderURLRequestJob::Start() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  // Start reading asynchronously so that all error reporting and data
-  // callbacks happen as they would for network requests.
-  SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING,
-                                  net::ERR_IO_PENDING));
-
-  // This could be done in the InputStreamReader but would force more
-  // complex synchronization in the delegate.
-  GetWorkerThreadRunner()->PostTask(
-      FROM_HERE,
-      base::Bind(
-          &OpenInputStreamOnWorkerThread,
-          base::MessageLoop::current()->message_loop_proxy(),
-          // This is intentional - the job could be deleted while the callback
-          // is executing on the background thread.
-          // The delegate will be "returned" to the job once the InputStream
-          // open attempt is completed.
-          base::Passed(&delegate_),
-          request()->url(),
-          base::Bind(&AndroidStreamReaderURLRequestJob::OnInputStreamOpened,
-                     weak_factory_.GetWeakPtr())));
-}
-
-void AndroidStreamReaderURLRequestJob::Kill() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  weak_factory_.InvalidateWeakPtrs();
-  URLRequestJob::Kill();
-}
-
-scoped_ptr<InputStreamReader>
-AndroidStreamReaderURLRequestJob::CreateStreamReader(InputStream* stream) {
-  return make_scoped_ptr(new InputStreamReader(stream));
-}
-
-void AndroidStreamReaderURLRequestJob::OnInputStreamOpened(
-      scoped_ptr<Delegate> returned_delegate,
-      scoped_ptr<android_webview::InputStream> input_stream) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(returned_delegate);
-  delegate_ = returned_delegate.Pass();
-
-  if (!input_stream) {
-    bool restart_required = false;
-    delegate_->OnInputStreamOpenFailed(request(), &restart_required);
-    if (restart_required) {
-      NotifyRestartRequired();
-    } else {
-      // Clear the IO_PENDING status set in Start().
-      SetStatus(net::URLRequestStatus());
-      HeadersComplete(kHTTPNotFound, kHTTPNotFoundText);
-    }
-    return;
-  }
-
-  scoped_ptr<InputStreamReader> input_stream_reader(
-      CreateStreamReader(input_stream.get()));
-  DCHECK(input_stream_reader);
-
-  DCHECK(!input_stream_reader_wrapper_.get());
-  input_stream_reader_wrapper_ = new InputStreamReaderWrapper(
-      input_stream.Pass(), input_stream_reader.Pass());
-
-  PostTaskAndReplyWithResult(
-      GetWorkerThreadRunner(),
-      FROM_HERE,
-      base::Bind(&InputStreamReaderWrapper::Seek,
-                 input_stream_reader_wrapper_,
-                 byte_range_),
-      base::Bind(&AndroidStreamReaderURLRequestJob::OnReaderSeekCompleted,
-                 weak_factory_.GetWeakPtr()));
-}
-
-void AndroidStreamReaderURLRequestJob::OnReaderSeekCompleted(int result) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  // Clear the IO_PENDING status set in Start().
-  SetStatus(net::URLRequestStatus());
-  if (result >= 0) {
-    set_expected_content_size(result);
-    HeadersComplete(kHTTPOk, kHTTPOkText);
-  } else {
-    NotifyDone(net::URLRequestStatus(net::URLRequestStatus::FAILED, result));
-  }
-}
-
-void AndroidStreamReaderURLRequestJob::OnReaderReadCompleted(int result) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  // The URLRequest API contract requires that:
-  // * NotifyDone be called once, to set the status code, indicate the job is
-  //   finished (there will be no further IO),
-  // * NotifyReadComplete be called if false is returned from ReadRawData to
-  //   indicate that the IOBuffer will not be used by the job anymore.
-  // There might be multiple calls to ReadRawData (and thus multiple calls to
-  // NotifyReadComplete), which is why NotifyDone is called only on errors
-  // (result < 0) and end of data (result == 0).
-  if (result == 0) {
-    NotifyDone(net::URLRequestStatus());
-  } else if (result < 0) {
-    NotifyDone(net::URLRequestStatus(net::URLRequestStatus::FAILED, result));
-  } else {
-    // Clear the IO_PENDING status.
-    SetStatus(net::URLRequestStatus());
-  }
-  NotifyReadComplete(result);
-}
-
-base::TaskRunner* AndroidStreamReaderURLRequestJob::GetWorkerThreadRunner() {
-  return static_cast<base::TaskRunner*>(BrowserThread::GetBlockingPool());
-}
-
-bool AndroidStreamReaderURLRequestJob::ReadRawData(net::IOBuffer* dest,
-                                                   int dest_size,
-                                                   int* bytes_read) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  if (!input_stream_reader_wrapper_.get()) {
-    // This will happen if opening the InputStream fails in which case the
-    // error is communicated by setting the HTTP response status header rather
-    // than failing the request during the header fetch phase.
-    *bytes_read = 0;
-    return true;
-  }
-
-  PostTaskAndReplyWithResult(
-      GetWorkerThreadRunner(),
-      FROM_HERE,
-      base::Bind(&InputStreamReaderWrapper::ReadRawData,
-                 input_stream_reader_wrapper_,
-                 make_scoped_refptr(dest),
-                 dest_size),
-      base::Bind(&AndroidStreamReaderURLRequestJob::OnReaderReadCompleted,
-                 weak_factory_.GetWeakPtr()));
-
-  SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING,
-                                  net::ERR_IO_PENDING));
-  return false;
-}
-
-bool AndroidStreamReaderURLRequestJob::GetMimeType(
-    std::string* mime_type) const {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  JNIEnv* env = AttachCurrentThread();
-  DCHECK(env);
-
-  if (!input_stream_reader_wrapper_.get())
-    return false;
-
-  // Since it's possible for this call to alter the InputStream a
-  // Seek or ReadRawData operation running in the background is not permitted.
-  DCHECK(!request_->status().is_io_pending());
-
-  return delegate_->GetMimeType(
-      env, request(), input_stream_reader_wrapper_->input_stream(), mime_type);
-}
-
-bool AndroidStreamReaderURLRequestJob::GetCharset(std::string* charset) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  JNIEnv* env = AttachCurrentThread();
-  DCHECK(env);
-
-  if (!input_stream_reader_wrapper_.get())
-    return false;
-
-  // Since it's possible for this call to alter the InputStream a
-  // Seek or ReadRawData operation running in the background is not permitted.
-  DCHECK(!request_->status().is_io_pending());
-
-  return delegate_->GetCharset(
-      env, request(), input_stream_reader_wrapper_->input_stream(), charset);
-}
-
-void AndroidStreamReaderURLRequestJob::HeadersComplete(
-    int status_code,
-    const std::string& status_text) {
-  std::string status("HTTP/1.1 ");
-  status.append(base::IntToString(status_code));
-  status.append(" ");
-  status.append(status_text);
-  // HttpResponseHeaders expects its input string to be terminated by two NULs.
-  status.append("\0\0", 2);
-  net::HttpResponseHeaders* headers = new net::HttpResponseHeaders(status);
-
-  if (status_code == kHTTPOk) {
-    if (expected_content_size() != -1) {
-      std::string content_length_header(
-          net::HttpRequestHeaders::kContentLength);
-      content_length_header.append(": ");
-      content_length_header.append(
-          base::Int64ToString(expected_content_size()));
-      headers->AddHeader(content_length_header);
-    }
-
-    std::string mime_type;
-    if (GetMimeType(&mime_type) && !mime_type.empty()) {
-      std::string content_type_header(net::HttpRequestHeaders::kContentType);
-      content_type_header.append(": ");
-      content_type_header.append(mime_type);
-      headers->AddHeader(content_type_header);
-    }
-  }
-
-  JNIEnv* env = AttachCurrentThread();
-  DCHECK(env);
-  delegate_->AppendResponseHeaders(env, headers);
-
-  // Indicate that the response had been obtained via shouldInterceptRequest.
-  headers->AddHeader(kResponseHeaderViaShouldInterceptRequest);
-
-  response_info_.reset(new net::HttpResponseInfo());
-  response_info_->headers = headers;
-
-  NotifyHeadersComplete();
-}
-
-int AndroidStreamReaderURLRequestJob::GetResponseCode() const {
-  if (response_info_)
-    return response_info_->headers->response_code();
-  return URLRequestJob::GetResponseCode();
-}
-
-void AndroidStreamReaderURLRequestJob::GetResponseInfo(
-    net::HttpResponseInfo* info) {
-  if (response_info_)
-    *info = *response_info_;
-}
-
-void AndroidStreamReaderURLRequestJob::SetExtraRequestHeaders(
-    const net::HttpRequestHeaders& headers) {
-  std::string range_header;
-  if (headers.GetHeader(net::HttpRequestHeaders::kRange, &range_header)) {
-    // We only extract the "Range" header so that we know how many bytes in the
-    // stream to skip and how many to read after that.
-    std::vector<net::HttpByteRange> ranges;
-    if (net::HttpUtil::ParseRangeHeader(range_header, &ranges)) {
-      if (ranges.size() == 1) {
-        byte_range_ = ranges[0];
-      } else {
-        // We don't support multiple range requests in one single URL request,
-        // because we need to do multipart encoding here.
-        NotifyDone(net::URLRequestStatus(
-            net::URLRequestStatus::FAILED,
-            net::ERR_REQUEST_RANGE_NOT_SATISFIABLE));
-      }
-    }
-  }
-}
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job.h b/android_webview/browser/net/android_stream_reader_url_request_job.h
deleted file mode 100644
index 8b7cafb..0000000
--- a/android_webview/browser/net/android_stream_reader_url_request_job.h
+++ /dev/null
@@ -1,126 +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.
-
-#ifndef ANDROID_WEBVIEW_NATIVE_ANDROID_STREAM_READER_URL_REQUEST_JOB_H_
-#define ANDROID_WEBVIEW_NATIVE_ANDROID_STREAM_READER_URL_REQUEST_JOB_H_
-
-#include <string>
-
-#include "base/android/scoped_java_ref.h"
-#include "base/location.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
-#include "base/threading/thread_checker.h"
-#include "net/http/http_byte_range.h"
-#include "net/url_request/url_request_job.h"
-
-namespace android_webview {
-class InputStream;
-class InputStreamReader;
-}
-
-namespace base {
-class TaskRunner;
-}
-
-namespace net {
-class HttpResponseHeaders;
-class HttpResponseInfo;
-class URLRequest;
-}
-
-class InputStreamReaderWrapper;
-
-// A request job that reads data from a Java InputStream.
-class AndroidStreamReaderURLRequestJob : public net::URLRequestJob {
- public:
-  /*
-   * We use a delegate so that we can share code for this job in slightly
-   * different contexts.
-   */
-  class Delegate {
-   public:
-    // This method is called from a worker thread, not from the IO thread.
-    virtual scoped_ptr<android_webview::InputStream> OpenInputStream(
-        JNIEnv* env,
-        const GURL& url) = 0;
-
-    // This method is called on the Job's thread if the result of calling
-    // OpenInputStream was null.
-    // Setting the |restart| parameter to true will cause the request to be
-    // restarted with a new job.
-    virtual void OnInputStreamOpenFailed(
-        net::URLRequest* request,
-        bool* restart) = 0;
-
-    virtual bool GetMimeType(
-        JNIEnv* env,
-        net::URLRequest* request,
-        android_webview::InputStream* stream,
-        std::string* mime_type) = 0;
-
-    virtual bool GetCharset(
-        JNIEnv* env,
-        net::URLRequest* request,
-        android_webview::InputStream* stream,
-        std::string* charset) = 0;
-
-    virtual void AppendResponseHeaders(JNIEnv* env,
-                                       net::HttpResponseHeaders* headers) = 0;
-
-    virtual ~Delegate() {}
-  };
-
-  AndroidStreamReaderURLRequestJob(
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate,
-      scoped_ptr<Delegate> delegate);
-
-  // URLRequestJob:
-  virtual void Start() OVERRIDE;
-  virtual void Kill() OVERRIDE;
-  virtual bool ReadRawData(net::IOBuffer* buf,
-                           int buf_size,
-                           int* bytes_read) OVERRIDE;
-  virtual void SetExtraRequestHeaders(
-      const net::HttpRequestHeaders& headers) OVERRIDE;
-  virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
-  virtual bool GetCharset(std::string* charset) OVERRIDE;
-  virtual int GetResponseCode() const OVERRIDE;
-  virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE;
-
- protected:
-  virtual ~AndroidStreamReaderURLRequestJob();
-
-  // Gets the TaskRunner for the worker thread.
-  // Overridden in unittests.
-  virtual base::TaskRunner* GetWorkerThreadRunner();
-
-  // Creates an InputStreamReader instance.
-  // Overridden in unittests to return a mock.
-  virtual scoped_ptr<android_webview::InputStreamReader>
-      CreateStreamReader(android_webview::InputStream* stream);
-
- private:
-  void HeadersComplete(int status_code, const std::string& status_text);
-
-  void OnInputStreamOpened(
-      scoped_ptr<Delegate> delegate,
-      scoped_ptr<android_webview::InputStream> input_stream);
-  void OnReaderSeekCompleted(int content_size);
-  void OnReaderReadCompleted(int bytes_read);
-
-  net::HttpByteRange byte_range_;
-  scoped_ptr<net::HttpResponseInfo> response_info_;
-  scoped_ptr<Delegate> delegate_;
-  scoped_refptr<InputStreamReaderWrapper> input_stream_reader_wrapper_;
-  base::ThreadChecker thread_checker_;
-
-  base::WeakPtrFactory<AndroidStreamReaderURLRequestJob> weak_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(AndroidStreamReaderURLRequestJob);
-};
-
-#endif  // ANDROID_WEBVIEW_NATIVE_ANDROID_STREAM_READER_URL_REQUEST_JOB_H_
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
deleted file mode 100644
index ec67bbf..0000000
--- a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
+++ /dev/null
@@ -1,423 +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.
-
-#include "android_webview/browser/input_stream.h"
-#include "android_webview/browser/net/android_stream_reader_url_request_job.h"
-#include "android_webview/browser/net/aw_url_request_job_factory.h"
-#include "android_webview/browser/net/input_stream_reader.h"
-#include "base/format_macros.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
-#include "base/run_loop.h"
-#include "base/strings/stringprintf.h"
-#include "net/base/request_priority.h"
-#include "net/http/http_byte_range.h"
-#include "net/http/http_response_headers.h"
-#include "net/url_request/url_request.h"
-#include "net/url_request/url_request_job_factory_impl.h"
-#include "net/url_request/url_request_test_util.h"
-
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using android_webview::InputStream;
-using android_webview::InputStreamReader;
-using net::TestDelegate;
-using net::TestJobInterceptor;
-using net::TestNetworkDelegate;
-using net::TestURLRequestContext;
-using net::URLRequest;
-using testing::DoAll;
-using testing::Ge;
-using testing::Gt;
-using testing::InSequence;
-using testing::Invoke;
-using testing::InvokeWithoutArgs;
-using testing::NotNull;
-using testing::Return;
-using testing::SaveArg;
-using testing::SetArgPointee;
-using testing::StrictMock;
-using testing::Test;
-using testing::WithArg;
-using testing::WithArgs;
-using testing::_;
-
-// Some of the classes will DCHECK on a null InputStream (which is desirable).
-// The workaround is to use this class. None of the methods need to be
-// implemented as the mock InputStreamReader should never forward calls to the
-// InputStream.
-class NotImplInputStream : public InputStream {
- public:
-  NotImplInputStream() {}
-  virtual ~NotImplInputStream() {}
-  virtual bool BytesAvailable(int* bytes_available) const OVERRIDE {
-    NOTIMPLEMENTED();
-    return false;
-  }
-  virtual bool Skip(int64_t n, int64_t* bytes_skipped) OVERRIDE {
-    NOTIMPLEMENTED();
-    return false;
-  }
-  virtual bool Read(net::IOBuffer* dest, int length, int* bytes_read) OVERRIDE {
-    NOTIMPLEMENTED();
-    return false;
-  }
-};
-
-// Required in order to create an instance of AndroidStreamReaderURLRequestJob.
-class StreamReaderDelegate :
-    public AndroidStreamReaderURLRequestJob::Delegate {
- public:
-  StreamReaderDelegate() {}
-
-  virtual scoped_ptr<InputStream> OpenInputStream(
-      JNIEnv* env,
-      const GURL& url) OVERRIDE {
-    return make_scoped_ptr<InputStream>(new NotImplInputStream());
-  }
-
-  virtual void OnInputStreamOpenFailed(net::URLRequest* request,
-                                       bool* restart) OVERRIDE {
-    *restart = false;
-  }
-
-  virtual bool GetMimeType(JNIEnv* env,
-                           net::URLRequest* request,
-                           android_webview::InputStream* stream,
-                           std::string* mime_type) OVERRIDE {
-    return false;
-  }
-
-  virtual bool GetCharset(JNIEnv* env,
-                          net::URLRequest* request,
-                          android_webview::InputStream* stream,
-                          std::string* charset) OVERRIDE {
-    return false;
-  }
-
-  virtual void AppendResponseHeaders(
-      JNIEnv* env,
-      net::HttpResponseHeaders* headers) OVERRIDE {
-    // no-op
-  }
-};
-
-class NullStreamReaderDelegate : public StreamReaderDelegate {
- public:
-  NullStreamReaderDelegate() {}
-
-  virtual scoped_ptr<InputStream> OpenInputStream(
-      JNIEnv* env,
-      const GURL& url) OVERRIDE {
-    return make_scoped_ptr<InputStream>(NULL);
-  }
-};
-
-class HeaderAlteringStreamReaderDelegate : public NullStreamReaderDelegate {
- public:
-  HeaderAlteringStreamReaderDelegate() {}
-
-  virtual void AppendResponseHeaders(
-      JNIEnv* env,
-      net::HttpResponseHeaders* headers) OVERRIDE {
-    headers->ReplaceStatusLine(kStatusLine);
-    std::string headerLine(kCustomHeaderName);
-    headerLine.append(": ");
-    headerLine.append(kCustomHeaderValue);
-    headers->AddHeader(headerLine);
-  }
-
-  static const int kResponseCode;
-  static const char* kStatusLine;
-  static const char* kCustomHeaderName;
-  static const char* kCustomHeaderValue;
-};
-
-const int HeaderAlteringStreamReaderDelegate::kResponseCode = 401;
-const char* HeaderAlteringStreamReaderDelegate::kStatusLine =
-    "HTTP/1.1 401 Gone";
-const char* HeaderAlteringStreamReaderDelegate::kCustomHeaderName =
-    "X-Test-Header";
-const char* HeaderAlteringStreamReaderDelegate::kCustomHeaderValue =
-    "TestHeaderValue";
-
-class MockInputStreamReader : public InputStreamReader {
- public:
-  MockInputStreamReader() : InputStreamReader(new NotImplInputStream()) {}
-  ~MockInputStreamReader() {}
-
-  MOCK_METHOD1(Seek, int(const net::HttpByteRange& byte_range));
-  MOCK_METHOD2(ReadRawData, int(net::IOBuffer* buffer, int buffer_size));
-};
-
-
-class TestStreamReaderJob : public AndroidStreamReaderURLRequestJob {
- public:
-  TestStreamReaderJob(
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate,
-      scoped_ptr<Delegate> delegate,
-      scoped_ptr<InputStreamReader> stream_reader)
-      : AndroidStreamReaderURLRequestJob(request,
-                                         network_delegate,
-                                         delegate.Pass()),
-        stream_reader_(stream_reader.Pass()) {
-    message_loop_proxy_ = base::MessageLoopProxy::current();
-  }
-
-  virtual scoped_ptr<InputStreamReader> CreateStreamReader(
-      InputStream* stream) OVERRIDE {
-    return stream_reader_.Pass();
-  }
- protected:
-  virtual ~TestStreamReaderJob() {}
-
-  virtual base::TaskRunner* GetWorkerThreadRunner() OVERRIDE {
-    return message_loop_proxy_.get();
-  }
-
-  scoped_ptr<InputStreamReader> stream_reader_;
-  scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
-};
-
-class AndroidStreamReaderURLRequestJobTest : public Test {
- public:
-  AndroidStreamReaderURLRequestJobTest() {}
-
- protected:
-  virtual void SetUp() {
-    context_.set_job_factory(&factory_);
-    context_.set_network_delegate(&network_delegate_);
-    req_ = context_.CreateRequest(GURL("content://foo"),
-                                  net::DEFAULT_PRIORITY,
-                                  &url_request_delegate_,
-                                  NULL);
-    req_->set_method("GET");
-  }
-
-  void SetRange(net::URLRequest* req, int first_byte, int last_byte) {
-    net::HttpRequestHeaders headers;
-    headers.SetHeader(net::HttpRequestHeaders::kRange,
-                      net::HttpByteRange::Bounded(
-                          first_byte, last_byte).GetHeaderValue());
-    req->SetExtraRequestHeaders(headers);
-  }
-
-  void SetUpTestJob(scoped_ptr<InputStreamReader> stream_reader) {
-    SetUpTestJob(stream_reader.Pass(),
-                 make_scoped_ptr(new StreamReaderDelegate())
-                     .PassAs<AndroidStreamReaderURLRequestJob::Delegate>());
-  }
-
-  void SetUpTestJob(scoped_ptr<InputStreamReader> stream_reader,
-                    scoped_ptr<AndroidStreamReaderURLRequestJob::Delegate>
-                        stream_reader_delegate) {
-    TestStreamReaderJob* test_stream_reader_job =
-        new TestStreamReaderJob(
-            req_.get(),
-            &network_delegate_,
-            stream_reader_delegate.Pass(),
-            stream_reader.Pass());
-    // The Interceptor is owned by the |factory_|.
-    TestJobInterceptor* protocol_handler = new TestJobInterceptor;
-    protocol_handler->set_main_intercept_job(test_stream_reader_job);
-    bool set_protocol = factory_.SetProtocolHandler("http", protocol_handler);
-    DCHECK(set_protocol);
-
-    protocol_handler = new TestJobInterceptor;
-    protocol_handler->set_main_intercept_job(test_stream_reader_job);
-    set_protocol = factory_.SetProtocolHandler("content", protocol_handler);
-    DCHECK(set_protocol);
-  }
-
-  base::MessageLoopForIO loop_;
-  TestURLRequestContext context_;
-  android_webview::AwURLRequestJobFactory factory_;
-  TestDelegate url_request_delegate_;
-  TestNetworkDelegate network_delegate_;
-  scoped_ptr<URLRequest> req_;
-};
-
-TEST_F(AndroidStreamReaderURLRequestJobTest, ReadEmptyStream) {
-  scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader(
-      new StrictMock<MockInputStreamReader>());
-  {
-    InSequence s;
-    EXPECT_CALL(*stream_reader, Seek(_))
-        .WillOnce(Return(0));
-    EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Gt(0)))
-        .WillOnce(Return(0));
-  }
-
-  SetUpTestJob(stream_reader.PassAs<InputStreamReader>());
-
-  req_->Start();
-
-  // The TestDelegate will quit the message loop on request completion.
-  base::MessageLoop::current()->Run();
-
-  EXPECT_FALSE(url_request_delegate_.request_failed());
-  EXPECT_EQ(1, network_delegate_.completed_requests());
-  EXPECT_EQ(0, network_delegate_.error_count());
-  EXPECT_EQ(200, req_->GetResponseCode());
-}
-
-TEST_F(AndroidStreamReaderURLRequestJobTest, ReadWithNullStream) {
-  SetUpTestJob(scoped_ptr<InputStreamReader>(),
-               make_scoped_ptr(new NullStreamReaderDelegate())
-                   .PassAs<AndroidStreamReaderURLRequestJob::Delegate>());
-  req_->Start();
-
-  // The TestDelegate will quit the message loop on request completion.
-  base::MessageLoop::current()->Run();
-
-  // The request_failed() method is named confusingly but all it checks is
-  // whether the request got as far as calling NotifyHeadersComplete.
-  EXPECT_FALSE(url_request_delegate_.request_failed());
-  EXPECT_EQ(1, network_delegate_.completed_requests());
-  // A null input stream shouldn't result in an error. See crbug.com/180950.
-  EXPECT_EQ(0, network_delegate_.error_count());
-  EXPECT_EQ(404, req_->GetResponseCode());
-}
-
-TEST_F(AndroidStreamReaderURLRequestJobTest, ModifyHeadersAndStatus) {
-  SetUpTestJob(scoped_ptr<InputStreamReader>(),
-               make_scoped_ptr(new HeaderAlteringStreamReaderDelegate())
-                   .PassAs<AndroidStreamReaderURLRequestJob::Delegate>());
-  req_->Start();
-
-  // The TestDelegate will quit the message loop on request completion.
-  base::MessageLoop::current()->Run();
-
-  // The request_failed() method is named confusingly but all it checks is
-  // whether the request got as far as calling NotifyHeadersComplete.
-  EXPECT_FALSE(url_request_delegate_.request_failed());
-  EXPECT_EQ(1, network_delegate_.completed_requests());
-  // A null input stream shouldn't result in an error. See crbug.com/180950.
-  EXPECT_EQ(0, network_delegate_.error_count());
-  EXPECT_EQ(HeaderAlteringStreamReaderDelegate::kResponseCode,
-            req_->GetResponseCode());
-  EXPECT_EQ(HeaderAlteringStreamReaderDelegate::kStatusLine,
-            req_->response_headers()->GetStatusLine());
-  EXPECT_TRUE(req_->response_headers()->HasHeader(
-      HeaderAlteringStreamReaderDelegate::kCustomHeaderName));
-  std::string header_value;
-  EXPECT_TRUE(req_->response_headers()->EnumerateHeader(
-      NULL, HeaderAlteringStreamReaderDelegate::kCustomHeaderName,
-      &header_value));
-  EXPECT_EQ(HeaderAlteringStreamReaderDelegate::kCustomHeaderValue,
-            header_value);
-}
-
-TEST_F(AndroidStreamReaderURLRequestJobTest, ReadPartOfStream) {
-  const int bytes_available = 128;
-  const int offset = 32;
-  const int bytes_to_read = bytes_available - offset;
-  scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader(
-      new StrictMock<MockInputStreamReader>());
-  {
-    InSequence s;
-    EXPECT_CALL(*stream_reader, Seek(_))
-        .WillOnce(Return(bytes_available));
-    EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
-        .WillOnce(Return(bytes_to_read/2));
-    EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
-        .WillOnce(Return(bytes_to_read/2));
-    EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
-        .WillOnce(Return(0));
-  }
-
-  SetUpTestJob(stream_reader.PassAs<InputStreamReader>());
-
-  SetRange(req_.get(), offset, bytes_available);
-  req_->Start();
-
-  base::MessageLoop::current()->Run();
-
-  EXPECT_FALSE(url_request_delegate_.request_failed());
-  EXPECT_EQ(bytes_to_read, url_request_delegate_.bytes_received());
-  EXPECT_EQ(1, network_delegate_.completed_requests());
-  EXPECT_EQ(0, network_delegate_.error_count());
-}
-
-TEST_F(AndroidStreamReaderURLRequestJobTest,
-       ReadStreamWithMoreAvailableThanActual) {
-  const int bytes_available_reported = 190;
-  const int bytes_available = 128;
-  const int offset = 0;
-  const int bytes_to_read = bytes_available - offset;
-  scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader(
-      new StrictMock<MockInputStreamReader>());
-  {
-    InSequence s;
-    EXPECT_CALL(*stream_reader, Seek(_))
-        .WillOnce(Return(bytes_available_reported));
-    EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
-        .WillOnce(Return(bytes_available));
-    EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
-        .WillOnce(Return(0));
-  }
-
-  SetUpTestJob(stream_reader.PassAs<InputStreamReader>());
-
-  SetRange(req_.get(), offset, bytes_available_reported);
-  req_->Start();
-
-  base::MessageLoop::current()->Run();
-
-  EXPECT_FALSE(url_request_delegate_.request_failed());
-  EXPECT_EQ(bytes_to_read, url_request_delegate_.bytes_received());
-  EXPECT_EQ(1, network_delegate_.completed_requests());
-  EXPECT_EQ(0, network_delegate_.error_count());
-}
-
-TEST_F(AndroidStreamReaderURLRequestJobTest, DeleteJobMidWaySeek) {
-  const int offset = 20;
-  const int bytes_available = 128;
-  base::RunLoop loop;
-  scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader(
-      new StrictMock<MockInputStreamReader>());
-  EXPECT_CALL(*stream_reader, Seek(_))
-      .WillOnce(DoAll(InvokeWithoutArgs(&loop, &base::RunLoop::Quit),
-                      Return(bytes_available)));
-  ON_CALL(*stream_reader, ReadRawData(_, _))
-      .WillByDefault(Return(0));
-
-  SetUpTestJob(stream_reader.PassAs<InputStreamReader>());
-
-  SetRange(req_.get(), offset, bytes_available);
-  req_->Start();
-
-  loop.Run();
-
-  EXPECT_EQ(0, network_delegate_.completed_requests());
-  req_->Cancel();
-  EXPECT_EQ(1, network_delegate_.completed_requests());
-}
-
-TEST_F(AndroidStreamReaderURLRequestJobTest, DeleteJobMidWayRead) {
-  const int offset = 20;
-  const int bytes_available = 128;
-  base::RunLoop loop;
-  scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader(
-      new StrictMock<MockInputStreamReader>());
-  net::CompletionCallback read_completion_callback;
-  EXPECT_CALL(*stream_reader, Seek(_))
-      .WillOnce(Return(bytes_available));
-  EXPECT_CALL(*stream_reader, ReadRawData(_, _))
-      .WillOnce(DoAll(InvokeWithoutArgs(&loop, &base::RunLoop::Quit),
-                      Return(bytes_available)));
-
-  SetUpTestJob(stream_reader.PassAs<InputStreamReader>());
-
-  SetRange(req_.get(), offset, bytes_available);
-  req_->Start();
-
-  loop.Run();
-
-  EXPECT_EQ(0, network_delegate_.completed_requests());
-  req_->Cancel();
-  EXPECT_EQ(1, network_delegate_.completed_requests());
-}
diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webview/browser/net/aw_network_delegate.cc
deleted file mode 100644
index 8c184c6..0000000
--- a/android_webview/browser/net/aw_network_delegate.cc
+++ /dev/null
@@ -1,137 +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.
-
-#include "android_webview/browser/net/aw_network_delegate.h"
-
-#include "android_webview/browser/aw_cookie_access_policy.h"
-#include "base/android/build_info.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_protocol.h"
-#include "net/base/net_errors.h"
-#include "net/base/completion_callback.h"
-#include "net/proxy/proxy_info.h"
-#include "net/proxy/proxy_server.h"
-#include "net/url_request/url_request.h"
-
-namespace android_webview {
-
-AwNetworkDelegate::AwNetworkDelegate()
-    : data_reduction_proxy_params_(NULL),
-      data_reduction_proxy_auth_request_handler_(NULL) {
-}
-
-AwNetworkDelegate::~AwNetworkDelegate() {
-}
-
-int AwNetworkDelegate::OnBeforeURLRequest(
-    net::URLRequest* request,
-    const net::CompletionCallback& callback,
-    GURL* new_url) {
-  return net::OK;
-}
-
-int AwNetworkDelegate::OnBeforeSendHeaders(
-    net::URLRequest* request,
-    const net::CompletionCallback& callback,
-    net::HttpRequestHeaders* headers) {
-
-  DCHECK(headers);
-  headers->SetHeaderIfMissing(
-      "X-Requested-With",
-      base::android::BuildInfo::GetInstance()->package_name());
-  return net::OK;
-}
-
-void AwNetworkDelegate::OnBeforeSendProxyHeaders(
-    net::URLRequest* request,
-    const net::ProxyInfo& proxy_info,
-    net::HttpRequestHeaders* headers) {
-  if (data_reduction_proxy_auth_request_handler_) {
-    data_reduction_proxy_auth_request_handler_->MaybeAddRequestHeader(
-        request, proxy_info.proxy_server(), headers);
-  }
-}
-
-void AwNetworkDelegate::OnSendHeaders(net::URLRequest* request,
-                                      const net::HttpRequestHeaders& headers) {
-}
-
-int AwNetworkDelegate::OnHeadersReceived(
-    net::URLRequest* request,
-    const net::CompletionCallback& callback,
-    const net::HttpResponseHeaders* original_response_headers,
-    scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
-    GURL* allowed_unsafe_redirect_url) {
-
-  data_reduction_proxy::MaybeBypassProxyAndPrepareToRetry(
-      data_reduction_proxy_params_,
-      request,
-      original_response_headers,
-      override_response_headers,
-      NULL /* returned bypass type */);
-
-  return net::OK;
-}
-
-void AwNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
-                                         const GURL& new_location) {
-}
-
-void AwNetworkDelegate::OnResponseStarted(net::URLRequest* request) {
-}
-
-void AwNetworkDelegate::OnRawBytesRead(const net::URLRequest& request,
-                                       int bytes_read) {
-}
-
-void AwNetworkDelegate::OnCompleted(net::URLRequest* request, bool started) {
-}
-
-void AwNetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) {
-}
-
-void AwNetworkDelegate::OnPACScriptError(int line_number,
-                                         const base::string16& error) {
-}
-
-net::NetworkDelegate::AuthRequiredResponse AwNetworkDelegate::OnAuthRequired(
-    net::URLRequest* request,
-    const net::AuthChallengeInfo& auth_info,
-    const AuthCallback& callback,
-    net::AuthCredentials* credentials) {
-  return AUTH_REQUIRED_RESPONSE_NO_ACTION;
-}
-
-bool AwNetworkDelegate::OnCanGetCookies(const net::URLRequest& request,
-                                        const net::CookieList& cookie_list) {
-  return AwCookieAccessPolicy::GetInstance()->OnCanGetCookies(request,
-                                                              cookie_list);
-}
-
-bool AwNetworkDelegate::OnCanSetCookie(const net::URLRequest& request,
-                                       const std::string& cookie_line,
-                                       net::CookieOptions* options) {
-  return AwCookieAccessPolicy::GetInstance()->OnCanSetCookie(request,
-                                                             cookie_line,
-                                                             options);
-}
-
-bool AwNetworkDelegate::OnCanAccessFile(const net::URLRequest& request,
-                                        const base::FilePath& path) const {
-  return true;
-}
-
-bool AwNetworkDelegate::OnCanThrottleRequest(
-    const net::URLRequest& request) const {
-  return false;
-}
-
-int AwNetworkDelegate::OnBeforeSocketStreamConnect(
-    net::SocketStream* stream,
-    const net::CompletionCallback& callback) {
-  return net::OK;
-}
-
-}  // namespace android_webview
diff --git a/android_webview/browser/net/aw_network_delegate.h b/android_webview/browser/net/aw_network_delegate.h
deleted file mode 100644
index 8771bbc..0000000
--- a/android_webview/browser/net/aw_network_delegate.h
+++ /dev/null
@@ -1,99 +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.
-
-#ifndef ANDROID_WEBVIEW_BROWSER_NET_AW_NETWORK_DELEGATE_H_
-#define ANDROID_WEBVIEW_BROWSER_NET_AW_NETWORK_DELEGATE_H_
-
-#include "base/basictypes.h"
-#include "net/base/network_delegate.h"
-
-namespace data_reduction_proxy {
-class DataReductionProxyAuthRequestHandler;
-class DataReductionProxyParams;
-}
-
-namespace net {
-class ProxyInfo;
-class URLRequest;
-}
-
-namespace android_webview {
-
-// WebView's implementation of the NetworkDelegate.
-class AwNetworkDelegate : public net::NetworkDelegate {
- public:
-  AwNetworkDelegate();
-  virtual ~AwNetworkDelegate();
-
-  // Sets the |DataReductionProxySettings| object to use. If not set, the
-  // NetworkDelegate will not perform any operations related to the data
-  // reduction proxy.
-  void set_data_reduction_proxy_params(
-      data_reduction_proxy::DataReductionProxyParams* params) {
-    data_reduction_proxy_params_ = params;
-  }
-
-  void set_data_reduction_proxy_auth_request_handler(
-      data_reduction_proxy::DataReductionProxyAuthRequestHandler* handler) {
-    data_reduction_proxy_auth_request_handler_ = handler;
-  }
-
- private:
-  // NetworkDelegate implementation.
-  virtual int OnBeforeURLRequest(net::URLRequest* request,
-                                 const net::CompletionCallback& callback,
-                                 GURL* new_url) OVERRIDE;
-  virtual int OnBeforeSendHeaders(net::URLRequest* request,
-                                  const net::CompletionCallback& callback,
-                                  net::HttpRequestHeaders* headers) OVERRIDE;
-  virtual void OnBeforeSendProxyHeaders(
-      net::URLRequest* request,
-      const net::ProxyInfo& proxy_info,
-      net::HttpRequestHeaders* headers) OVERRIDE;
-  virtual void OnSendHeaders(net::URLRequest* request,
-                             const net::HttpRequestHeaders& headers) OVERRIDE;
-  virtual int OnHeadersReceived(
-      net::URLRequest* request,
-      const net::CompletionCallback& callback,
-      const net::HttpResponseHeaders* original_response_headers,
-      scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
-      GURL* allowed_unsafe_redirect_url) OVERRIDE;
-  virtual void OnBeforeRedirect(net::URLRequest* request,
-                                const GURL& new_location) OVERRIDE;
-  virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE;
-  virtual void OnRawBytesRead(const net::URLRequest& request,
-                              int bytes_read) OVERRIDE;
-  virtual void OnCompleted(net::URLRequest* request, bool started) OVERRIDE;
-  virtual void OnURLRequestDestroyed(net::URLRequest* request) OVERRIDE;
-  virtual void OnPACScriptError(int line_number,
-                                const base::string16& error) OVERRIDE;
-  virtual net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(
-      net::URLRequest* request,
-      const net::AuthChallengeInfo& auth_info,
-      const AuthCallback& callback,
-      net::AuthCredentials* credentials) OVERRIDE;
-  virtual bool OnCanGetCookies(const net::URLRequest& request,
-                               const net::CookieList& cookie_list) OVERRIDE;
-  virtual bool OnCanSetCookie(const net::URLRequest& request,
-                              const std::string& cookie_line,
-                              net::CookieOptions* options) OVERRIDE;
-  virtual bool OnCanAccessFile(const net::URLRequest& request,
-                               const base::FilePath& path) const OVERRIDE;
-  virtual bool OnCanThrottleRequest(
-      const net::URLRequest& request) const OVERRIDE;
-  virtual int OnBeforeSocketStreamConnect(
-      net::SocketStream* stream,
-      const net::CompletionCallback& callback) OVERRIDE;
-
-  // Data reduction proxy parameters object. Must outlive this.
-  data_reduction_proxy::DataReductionProxyParams* data_reduction_proxy_params_;
-  data_reduction_proxy::DataReductionProxyAuthRequestHandler*
-  data_reduction_proxy_auth_request_handler_;
-
-  DISALLOW_COPY_AND_ASSIGN(AwNetworkDelegate);
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_NET_AW_NETWORK_DELEGATE_H_
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
deleted file mode 100644
index 2e7d4124..0000000
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ /dev/null
@@ -1,286 +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.
-
-#include "android_webview/browser/net/aw_url_request_context_getter.h"
-
-#include <vector>
-
-#include "android_webview/browser/aw_browser_context.h"
-#include "android_webview/browser/aw_content_browser_client.h"
-#include "android_webview/browser/aw_request_interceptor.h"
-#include "android_webview/browser/net/aw_network_delegate.h"
-#include "android_webview/browser/net/aw_url_request_job_factory.h"
-#include "android_webview/browser/net/init_native_callback.h"
-#include "android_webview/common/aw_content_client.h"
-#include "base/command_line.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/threading/sequenced_worker_pool.h"
-#include "base/threading/worker_pool.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_config_service.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/content_browser_client.h"
-#include "content/public/browser/cookie_store_factory.h"
-#include "content/public/common/content_client.h"
-#include "content/public/common/content_switches.h"
-#include "content/public/common/url_constants.h"
-#include "net/base/cache_type.h"
-#include "net/base/net_log.h"
-#include "net/cookies/cookie_store.h"
-#include "net/dns/mapped_host_resolver.h"
-#include "net/http/http_cache.h"
-#include "net/http/http_stream_factory.h"
-#include "net/proxy/proxy_service.h"
-#include "net/socket/next_proto.h"
-#include "net/ssl/default_channel_id_store.h"
-#include "net/url_request/data_protocol_handler.h"
-#include "net/url_request/file_protocol_handler.h"
-#include "net/url_request/url_request_context_builder.h"
-#include "net/url_request/url_request_context.h"
-#include "net/url_request/url_request_intercepting_job_factory.h"
-#include "net/url_request/url_request_interceptor.h"
-
-using content::BrowserThread;
-using data_reduction_proxy::DataReductionProxySettings;
-
-namespace android_webview {
-
-
-namespace {
-
-void ApplyCmdlineOverridesToURLRequestContextBuilder(
-    net::URLRequestContextBuilder* builder) {
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kHostResolverRules)) {
-    // If hostname remappings were specified on the command-line, layer these
-    // rules on top of the real host resolver. This allows forwarding all
-    // requests through a designated test server.
-    scoped_ptr<net::MappedHostResolver> host_resolver(
-        new net::MappedHostResolver(
-            net::HostResolver::CreateDefaultResolver(NULL)));
-    host_resolver->SetRulesFromString(
-        command_line.GetSwitchValueASCII(switches::kHostResolverRules));
-    builder->set_host_resolver(host_resolver.release());
-  }
-}
-
-void ApplyCmdlineOverridesToNetworkSessionParams(
-    net::HttpNetworkSession::Params* params) {
-  int value;
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kTestingFixedHttpPort)) {
-    base::StringToInt(command_line.GetSwitchValueASCII(
-        switches::kTestingFixedHttpPort), &value);
-    params->testing_fixed_http_port = value;
-  }
-  if (command_line.HasSwitch(switches::kTestingFixedHttpsPort)) {
-    base::StringToInt(command_line.GetSwitchValueASCII(
-        switches::kTestingFixedHttpsPort), &value);
-    params->testing_fixed_https_port = value;
-  }
-  if (command_line.HasSwitch(switches::kIgnoreCertificateErrors)) {
-    params->ignore_certificate_errors = true;
-  }
-}
-
-void PopulateNetworkSessionParams(
-    net::URLRequestContext* context,
-    net::HttpNetworkSession::Params* params) {
-  params->host_resolver = context->host_resolver();
-  params->cert_verifier = context->cert_verifier();
-  params->channel_id_service = context->channel_id_service();
-  params->transport_security_state = context->transport_security_state();
-  params->proxy_service = context->proxy_service();
-  params->ssl_config_service = context->ssl_config_service();
-  params->http_auth_handler_factory = context->http_auth_handler_factory();
-  params->network_delegate = context->network_delegate();
-  params->http_server_properties = context->http_server_properties();
-  params->net_log = context->net_log();
-  // TODO(sgurun) remove once crbug.com/329681 is fixed.
-  params->next_protos = net::NextProtosSpdy31();
-  params->use_alternate_protocols = true;
-
-  ApplyCmdlineOverridesToNetworkSessionParams(params);
-}
-
-scoped_ptr<net::URLRequestJobFactory> CreateJobFactory(
-    content::ProtocolHandlerMap* protocol_handlers,
-    content::URLRequestInterceptorScopedVector request_interceptors) {
-  scoped_ptr<AwURLRequestJobFactory> aw_job_factory(new AwURLRequestJobFactory);
-  bool set_protocol = aw_job_factory->SetProtocolHandler(
-      url::kFileScheme,
-      new net::FileProtocolHandler(
-          content::BrowserThread::GetBlockingPool()->
-              GetTaskRunnerWithShutdownBehavior(
-                  base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)));
-  DCHECK(set_protocol);
-  set_protocol = aw_job_factory->SetProtocolHandler(
-      url::kDataScheme, new net::DataProtocolHandler());
-  DCHECK(set_protocol);
-  set_protocol = aw_job_factory->SetProtocolHandler(
-      url::kBlobScheme,
-      (*protocol_handlers)[url::kBlobScheme].release());
-  DCHECK(set_protocol);
-  set_protocol = aw_job_factory->SetProtocolHandler(
-      url::kFileSystemScheme,
-      (*protocol_handlers)[url::kFileSystemScheme].release());
-  DCHECK(set_protocol);
-  set_protocol = aw_job_factory->SetProtocolHandler(
-      content::kChromeUIScheme,
-      (*protocol_handlers)[content::kChromeUIScheme].release());
-  DCHECK(set_protocol);
-  set_protocol = aw_job_factory->SetProtocolHandler(
-      content::kChromeDevToolsScheme,
-      (*protocol_handlers)[content::kChromeDevToolsScheme].release());
-  DCHECK(set_protocol);
-  protocol_handlers->clear();
-
-  // Note that even though the content:// scheme handler is created here,
-  // it cannot be used by child processes until access to it is granted via
-  // ChildProcessSecurityPolicy::GrantScheme(). This is done in
-  // AwContentBrowserClient.
-  request_interceptors.push_back(
-      CreateAndroidContentRequestInterceptor().release());
-  request_interceptors.push_back(
-      CreateAndroidAssetFileRequestInterceptor().release());
-  // The AwRequestInterceptor must come after the content and asset file job
-  // factories. This for WebViewClassic compatibility where it was not
-  // possible to intercept resource loads to resolvable content:// and
-  // file:// URIs.
-  // This logical dependency is also the reason why the Content
-  // URLRequestInterceptor has to be added as an interceptor rather than as a
-  // ProtocolHandler.
-  request_interceptors.push_back(new AwRequestInterceptor());
-
-  // The chain of responsibility will execute the handlers in reverse to the
-  // order in which the elements of the chain are created.
-  scoped_ptr<net::URLRequestJobFactory> job_factory(aw_job_factory.Pass());
-  for (content::URLRequestInterceptorScopedVector::reverse_iterator i =
-           request_interceptors.rbegin();
-       i != request_interceptors.rend();
-       ++i) {