| Index: base/android/base_jni_registrar.cc
|
| diff --git a/base/android/base_jni_registrar.cc b/base/android/base_jni_registrar.cc
|
| index 9a87a25a15e917ec3fc48e3bfc268005d6119ea0..c47437580a2d415071fbe4c7fd61b90b524f7a50 100644
|
| --- a/base/android/base_jni_registrar.cc
|
| +++ b/base/android/base_jni_registrar.cc
|
| @@ -24,10 +24,6 @@
|
| #include "base/message_loop/message_pump_android.h"
|
| #include "base/power_monitor/power_monitor_device_source_android.h"
|
|
|
| -#if defined(GOOGLE_TV)
|
| -#include "base/android/context_types.h"
|
| -#endif
|
| -
|
| namespace base {
|
| namespace android {
|
|
|
| @@ -35,9 +31,6 @@ static RegistrationMethod kBaseRegisteredMethods[] = {
|
| { "ActivityStatus", base::android::ActivityStatus::RegisterBindings },
|
| { "BuildInfo", base::android::BuildInfo::RegisterBindings },
|
| { "CommandLine", base::android::RegisterCommandLine },
|
| -#if defined(GOOGLE_TV)
|
| - { "ContextTypes", base::android::RegisterContextTypes },
|
| -#endif
|
| { "ContentUriUtils", base::RegisterContentUriUtils },
|
| { "CpuFeatures", base::android::RegisterCpuFeatures },
|
| { "ImportantFileWriterAndroid",
|
|
|