diff options
| author | dtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 01:44:18 +0000 |
|---|---|---|
| committer | dtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 01:44:18 +0000 |
| commit | 6313bb0014b49cbf7bd341d2b6da067ba1fa4d5c (patch) | |
| tree | 9e11c3d5fff2ac4409785dd26ff0850289af659b /chrome/browser | |
| parent | 2bd16e7105e0c764d2c23f29d7cad9e8e6ac5ee4 (diff) | |
| download | chromium_src-6313bb0014b49cbf7bd341d2b6da067ba1fa4d5c.zip chromium_src-6313bb0014b49cbf7bd341d2b6da067ba1fa4d5c.tar.gz chromium_src-6313bb0014b49cbf7bd341d2b6da067ba1fa4d5c.tar.bz2 | |
Revert "Revert 155950 - Add initial Chromium TestShell support for Android"
Fixed build breakages:
-Had to add DEPS file for testshell/java.
-Something changed with ant from the time I tested and the time my CL got committed. Had to move
sdk-targets.xml import in the ant file to the end of the file.
This reverts commit 2d30dc03dc0bd0723236c549313774119f163056.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10905209
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chrome_browser_main_android.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc index 83d4e9d..c9662fb 100644 --- a/chrome/browser/chrome_browser_main_android.cc +++ b/chrome/browser/chrome_browser_main_android.cc @@ -4,8 +4,6 @@ #include "chrome/browser/chrome_browser_main_android.h" -#include "base/android/jni_android.h" -#include "chrome/browser/android/chrome_jni_registrar.h" #include "chrome/common/chrome_switches.h" #include "content/public/common/main_function_params.h" #include "net/android/network_change_notifier_factory.h" @@ -20,11 +18,6 @@ ChromeBrowserMainPartsAndroid::~ChromeBrowserMainPartsAndroid() { } void ChromeBrowserMainPartsAndroid::PreEarlyInitialization() { - JNIEnv* env = base::android::AttachCurrentThread(); - DCHECK(env); - - chrome::android::RegisterJni(env); - net::NetworkChangeNotifier::SetFactory( new net::android::NetworkChangeNotifierFactory()); |