• Home
  • History
  • Annotate
  • only in /external/chromium_org/base/android/
History log of /external/chromium_org/base/android/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
692aa6783ce49a8866b0592a56ffd48de8b2ea33 13-Nov-2014 jdduke <jdduke@chromium.org> Cherry-pick: Reland [Android] Mark posted UI thread tasks as asynchronous

Clean cherry-pick of chromium
crrev.com/d51117a99a4e023e791134185c6db12b28028a1d

BUG: 18283959

Original description:

Chromium shares a message loop with Android on the browser UI thread.
This can cause problems when the associated Looper has a sync barrier,
preventing posted Chromium tasks from being dispatched until the
barrier is removed. Make this sharing more fair by marking all Chromium
Message tasks as asynchronous, avoiding stalls when there is a sync
barrier.

Note: This change was originally landed in crrev.com/512333002, but was
reverted to gather more data about sync barrier impact and investigate
alternative solutions. The investigation determiend that this approach
is fine for the near future, though it will likely evolve in time.

Change-Id: I9879a9c1bdad0dcec12c2bbee62356a5b12d9596
ava/src/org/chromium/base/SystemMessageHandler.java
7a4903d2d8aef7ca5e09f0f5ceed845ce4625934 13-Nov-2014 jdduke <jdduke@chromium.org> Cherry-pick: Revert of [Android] Experimental sync barrier detection for tracing (patchset #6 id:100001 of https://codereview.chromium.org/575103002/)

Cherry-pick of chromium
crrev.com/adefc40cb9652a2ea046bbdbef223d881f4a7463

Conflicts:
base/android/java/src/org/chromium/base/SystemMessageHandler.java

BUG: 18283959

Original description:

Reason for revert:
Barrier detection is no longer necessary, see crrev.com/512333002.

Original issue's description:
> [Android] Experimental sync barrier detection for tracing
>
> When an Android View is invalidated outside of frame dispatch
> (animation/input/draw), a sync barrier may be inserted into the shared
> UI thread message loop. This effectively blocks dispatch of all Chrome
> tasks posted to the browser UI thread for an entire frame (or more if
> the View is continually invalidated).
>
> There are currently no easy or even automated ways to avoid this
> untimely invalidation, and judicious coding can only take us so far. As
> an intermediate assist in debugging the issue, use reflection and a
> crude form of MessageQueue inspection to trace known cases where the
> MessageQueue is blocked by a sync barrier.
>
> Note that this detection is not perfect, neither is it exact, but it's a
> solid proxy for informing traces about such pipeline stalls.
>
> BUG=407133
>
> Committed: https://crrev.com/85bceaa6e05ee1bf42ac220ddcbb50ca268c1ea4
> Cr-Commit-Position: refs/heads/master@{#296249}

Change-Id: Ie92ab895b864bf466ac092a1a1b7fdc80a8fd3ce
ava/src/org/chromium/base/SystemMessageHandler.java
ab8f6f0bd665d3c1ff476eb06c58c42630e462d4 29-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.44

This commit was generated by merge_to_master.py.

Change-Id: I12ecf158017b8be5f9a1d33f4152e5a3c812cb7f
ava/src/org/chromium/base/ApiCompatibilityUtils.java
ava/src/org/chromium/base/SysUtils.java
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
uild_info.cc
uild_info.h
ava/src/org/chromium/base/ApiCompatibilityUtils.java
ava/src/org/chromium/base/ApplicationStatus.java
ava/src/org/chromium/base/BaseSwitches.java
ava/src/org/chromium/base/BuildInfo.java
ava/src/org/chromium/base/CollectionUtil.java
ava/src/org/chromium/base/CommandLine.java
ava/src/org/chromium/base/ContentUriUtils.java
ava/src/org/chromium/base/LocaleUtils.java
ava/src/org/chromium/base/ObserverList.java
ava/src/org/chromium/base/PerfTraceEvent.java
ava/src/org/chromium/base/ResourceExtractor.java
ava/src/org/chromium/base/SystemMessageHandler.java
ava/src/org/chromium/base/UsedByReflection.java
ava/src/org/chromium/base/VisibleForTesting.java
ava/src/org/chromium/base/library_loader/LibraryLoader.java
ava/src/org/chromium/base/library_loader/LibraryLoaderHelper.java
ava/src/org/chromium/base/library_loader/Linker.java
avatests/src/org/chromium/base/CommandLineTest.java
inker/linker_jni.cc
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
ase_jni_registrar.cc
ava/src/org/chromium/base/ApplicationStatus.java
ava/src/org/chromium/base/JNIUtils.java
ava/src/org/chromium/base/library_loader/Linker.java
ava/templates/NativeLibraries.template
ava/templates/native_libraries_array.h
ava/templates/native_libraries_version.h
ni_android.cc
ni_android.h
ni_generator/golden_sample_for_tests_jni.h
ni_generator/jni_generator.py
ni_generator/testCalledByNatives.golden
ni_generator/testConstantsFromJavaP.golden
ni_generator/testEagerCalledByNativesOption.golden
ni_generator/testFromJavaP.golden
ni_generator/testFromJavaPGenerics.golden
ni_generator/testInnerClassNatives.golden
ni_generator/testInnerClassNativesBothInnerAndOuter.golden
ni_generator/testInnerClassNativesMultiple.golden
ni_generator/testJNIInitNativeNameOption.golden
ni_generator/testJarJarRemapping.golden
ni_generator/testMultipleJNIAdditionalImport.golden
ni_generator/testNativeExportsOption.golden
ni_generator/testNatives.golden
ni_generator/testNativesLong.golden
ni_generator/testPureNativeMethodsOption.golden
ni_generator/testSingleJNIAdditionalImport.golden
ni_utils.cc
ni_utils.h
inker/linker_jni.cc
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
ava/src/org/chromium/base/ContentUriUtils.java
ava/src/org/chromium/base/library_loader/LibraryLoader.java
ni_generator/jni_generator.py
ni_generator/jni_generator_tests.py
ni_generator/testNativeExportsOption.golden
ibrary_loader/library_loader_hooks.cc
ibrary_loader/library_loader_hooks.h
inker/linker_jni.cc
ath_utils_unittest.cc
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
ava/src/org/chromium/base/ApiCompatibilityUtils.java
ava/src/org/chromium/base/NativeCall.java
ni_array.cc
ni_array.h
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
WNERS
ase_jni_registrar.cc
uild_info.cc
ield_trial_list.cc
ield_trial_list.h
ava/src/org/chromium/base/BaseSwitches.java
ava/src/org/chromium/base/FieldTrialList.java
ava/src/org/chromium/base/SysUtils.java
ava/src/org/chromium/base/library_loader/LibraryLoader.java
ava/src/org/chromium/base/library_loader/Linker.java
ava/templates/NativeLibraries.template
avatests/src/org/chromium/base/AdvancedMockContextTest.java
ni_android.cc
ni_generator/jni_generator.py
inker/linker_jni.cc
ys_utils.cc
ys_utils.h
ys_utils_unittest.cc
6d86b77056ed63eb6871182f42a9fd5f07550f90 25-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
ni_android.cc
ni_android.h
ni_generator/jni_generator.py
ni_generator/jni_generator_tests.py
ni_generator/testJarJarRemapping.golden
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
WNERS
ase_jni_registrar.cc
vent_log.cc
vent_log.h
ava/src/org/chromium/base/EventLog.java
ava/src/org/chromium/base/SystemMessageHandler.java
ava/src/org/chromium/base/library_loader/Linker.java
ni_weak_ref.h
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
ni_generator/jni_generator.py
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
WNERS
ava/src/org/chromium/base/JNIAdditionalImport.java
ava/src/org/chromium/base/library_loader/Linker.java
ni_generator/jni_generator.gyp
ni_generator/jni_generator.py
ni_generator/jni_generator_tests.py
ni_generator/testMultipleJNIAdditionalImport.golden
ni_generator/testSingleJNIAdditionalImport.golden
inker/linker_jni.cc
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
ni_array.cc
ni_generator/android_jar.classes
ni_generator/golden_sample_for_tests_jni.h
ni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java
ni_generator/jni_generator.py
ni_generator/jni_generator_tests.py
ni_generator/testCalledByNatives.golden
ni_generator/testConstantsFromJavaP.golden
ni_generator/testEagerCalledByNativesOption.golden
ni_generator/testFromJavaP.golden
ni_generator/testFromJavaPGenerics.golden
ni_generator/testInnerClassNatives.golden
ni_generator/testInnerClassNativesBothInnerAndOuter.golden
ni_generator/testInnerClassNativesMultiple.golden
ni_generator/testJNIInitNativeNameOption.golden
ni_generator/testJarJarRemapping.golden
ni_generator/testNatives.golden
ni_generator/testNativesLong.golden
ni_generator/testPureNativeMethodsOption.golden
ni_int_wrapper.h
ibrary_loader/library_loader_hooks.cc
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
ava/src/org/chromium/base/ApiCompatibilityUtils.java
ava/src/org/chromium/base/SysUtils.java
ni_helper.h
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
ava/src/org/chromium/base/TraceEvent.java
ava/src/org/chromium/base/library_loader/LibraryLoader.java
ni_helper.cc
ni_helper.h
ni_weak_ref.cc
ni_weak_ref.h
race_event_binding.cc
a02191e04bc25c4935f804f2c080ae28663d096d 16-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
ava/src/org/chromium/base/ApiCompatibilityUtils.java
ava/src/org/chromium/base/TraceEvent.java
ni_generator/jni_generator.py
race_event_binding.cc
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
ava/src/org/chromium/base/library_loader/LibraryLoader.java
ava/src/org/chromium/base/library_loader/LibraryLoaderHelper.java
coped_java_ref.cc
coped_java_ref.h
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
ava/src/org/chromium/base/library_loader/LibraryLoader.java
ava/src/org/chromium/base/library_loader/LibraryLoaderHelper.java
avatests/src/org/chromium/base/LibraryLoaderHelperTest.java
ni_generator/jni_generator.py
ni_generator/jni_generator_tests.py
ibrary_loader/library_loader_hooks.cc
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
ontent_uri_utils.cc
ontent_uri_utils.h
ava/src/org/chromium/base/ObserverList.java
ava/src/org/chromium/base/library_loader/LibraryLoader.java
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
ctivity_state_list.h
ctivity_status.cc
ctivity_status.h
ctivity_status_unittest.cc
pplication_state_list.h
pplication_status_listener.cc
pplication_status_listener.h
pplication_status_listener_unittest.cc
ase_jni_registrar.cc
uild_info.cc
ava/src/org/chromium/base/ActivityState.java
ava/src/org/chromium/base/ActivityState.template
ava/src/org/chromium/base/ActivityStatus.java
ava/src/org/chromium/base/ApiCompatibilityUtils.java
ava/src/org/chromium/base/ApplicationState.template
ava/src/org/chromium/base/ApplicationStatus.java
ava/src/org/chromium/base/BaseChromiumApplication.java
ava/src/org/chromium/base/CommandLine.java
ava/src/org/chromium/base/ObserverList.java
ava/src/org/chromium/base/PowerMonitor.java
ava/src/org/chromium/base/SystemMessageHandler.java
ava/src/org/chromium/base/TraceEvent.java
ava/src/org/chromium/base/WeakContext.java
ava/src/org/chromium/base/WindowCallbackWrapper.java
ava/src/org/chromium/base/library_loader/LibraryLoader.java
ava/src/org/chromium/base/library_loader/Linker.java
ava_handler_thread.cc
ava_handler_thread.h
avatests/src/org/chromium/base/ObserverListTest.java
ni_generator/jni_generator.py
ni_generator/jni_generator_tests.py
ni_generator/testConstantsFromJavaP.golden
ni_generator/testInputStream.javap
ni_generator/testMotionEvent.javap
ni_generator/testMotionEvent.javap7
ath_utils_unittest.cc
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
WNERS
ase_jni_registrar.cc
uild_info.cc
uild_info.h
ontext_types.cc
ontext_types.h
ava/src/org/chromium/base/ActivityStatus.java
ava/src/org/chromium/base/ApiCompatibilityUtils.java
ava/src/org/chromium/base/BaseSwitches.java
ava/src/org/chromium/base/BuildInfo.java
ava/src/org/chromium/base/ContextTypes.java
ava/src/org/chromium/base/PathUtils.java
ava/src/org/chromium/base/PerfTraceEvent.java
ava/src/org/chromium/base/SysUtils.java
ava/src/org/chromium/base/TraceEvent.java
ava/src/org/chromium/base/library_loader/LibraryLoader.java
ava/src/org/chromium/base/library_loader/Linker.java
ava/src/org/chromium/base/library_loader/LoaderErrors.java
ava/src/org/chromium/base/library_loader/ProcessInitException.java
ava/templates/NativeLibraries.template
ava/templates/native_libraries_array.h
ava/templates/native_libraries_version.h
avatests/src/org/chromium/base/ContextTypesTest.java
ni_android.cc
ni_array.cc
ni_generator/golden_sample_for_tests_jni.h
ni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java
ni_generator/jni_generator.gyp
ni_generator/jni_generator.py
ni_generator/jni_generator_helper.h
ni_generator/jni_generator_tests.py
ni_generator/sample_for_tests.cc
ni_generator/sample_for_tests.h
ni_generator/testCalledByNatives.golden
ni_generator/testEagerCalledByNativesOption.golden
ni_generator/testFromJavaP.golden
ni_generator/testFromJavaPGenerics.golden
ni_generator/testInnerClassNatives.golden
ni_generator/testInnerClassNativesBothInnerAndOuter.golden
ni_generator/testInnerClassNativesMultiple.golden
ni_generator/testJNIInitNativeNameOption.golden
ni_generator/testJarJarRemapping.golden
ni_generator/testNatives.golden
ni_generator/testNativesLong.golden
ni_generator/testPureNativeMethodsOption.golden
ibrary_loader/library_loader_hooks.cc
ibrary_loader/library_loader_hooks.h
inker/DEPS
inker/linker_jni.cc
ys_utils.h
race_event_binding.cc
race_event_binding.h
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
WNERS
ava/src/org/chromium/base/AccessedByNative.java
ava/src/org/chromium/base/ActivityState.template
ava/src/org/chromium/base/ActivityStatus.java
ava/src/org/chromium/base/ApiCompatibilityUtils.java
ava/src/org/chromium/base/BaseSwitches.java
ava/src/org/chromium/base/BuildInfo.java
ava/src/org/chromium/base/CalledByNative.java
ava/src/org/chromium/base/CalledByNativeUnchecked.java
ava/src/org/chromium/base/CollectionUtil.java
ava/src/org/chromium/base/CommandLine.java
ava/src/org/chromium/base/ContentUriUtils.java
ava/src/org/chromium/base/ContextTypes.java
ava/src/org/chromium/base/CpuFeatures.java
ava/src/org/chromium/base/ImportantFileWriterAndroid.java
ava/src/org/chromium/base/JNINamespace.java
ava/src/org/chromium/base/JavaHandlerThread.java
ava/src/org/chromium/base/MemoryPressureListener.java
ava/src/org/chromium/base/NativeClassQualifiedName.java
ava/src/org/chromium/base/ObserverList.java
ava/src/org/chromium/base/PathService.java
ava/src/org/chromium/base/PathUtils.java
ava/src/org/chromium/base/PowerMonitor.java
ava/src/org/chromium/base/PowerStatusReceiver.java
ava/src/org/chromium/base/SysUtils.java
ava/src/org/chromium/base/SystemMessageHandler.java
ava/src/org/chromium/base/ThreadUtils.java
ava/src/org/chromium/base/WeakContext.java
avatests/src/org/chromium/base/CommandLineTest.java
avatests/src/org/chromium/base/ContextTypesTest.java
avatests/src/org/chromium/base/ObserverListTest.java
ni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java
ni_generator/jni_generator_tests.py
ni_generator/testCalledByNatives.golden
ni_generator/testFromJavaP.golden
ni_generator/testFromJavaPGenerics.golden
ni_generator/testInnerClassNatives.golden
ni_generator/testInnerClassNativesBothInnerAndOuter.golden
ni_generator/testInnerClassNativesMultiple.golden
ni_generator/testJarJarRemapping.golden
ni_generator/testNatives.golden
ni_generator/testNativesLong.golden
ys_utils.cc
ys_utils.h
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
ase_jni_registrar.cc
ommand_line_android.cc
ommand_line_android.h
ontent_uri_utils.cc
ontent_uri_utils.h
ava/src/org/chromium/base/ApiCompatibilityUtils.java
ava/src/org/chromium/base/BaseSwitches.java
ava/src/org/chromium/base/CommandLine.java
ava/src/org/chromium/base/ContentUriUtils.java
ava/src/org/chromium/base/JavaHandlerThread.java
ava/src/org/chromium/base/SysUtils.java
ava/src/org/chromium/base/SystemMessageHandler.java
ava_handler_thread.cc
avatests/src/org/chromium/base/CommandLineTest.java
ni_android.cc
ni_android.h
ys_utils.cc
ys_utils.h
ys_utils_unittest.cc
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
ni_generator/jni_generator.py
ni_generator/jni_generator_tests.py
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
ava/src/org/chromium/base/ThreadUtils.java
ni_generator/jni_generator.py
ni_generator/jni_generator_tests.py
ys_utils.cc
8bcbed890bc3ce4d7a057a8f32cab53fa534672e 22-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
ava/src/org/chromium/base/ActivityStatus.java
ys_utils.cc
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
ava/src/org/chromium/base/ActivityStatus.java
ava/src/org/chromium/base/BaseChromiumApplication.java
ava/src/org/chromium/base/ChromiumApplication.java
ava/src/org/chromium/base/MemoryPressureListener.java
ni_android.cc
ni_android.h
ni_android_unittest.cc
ni_generator/golden_sample_for_tests_jni.h
ni_generator/jni_generator.py
ni_generator/jni_generator_tests.py
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
ava/src/org/chromium/base/ActivityStatus.java
ava/src/org/chromium/base/ChromiumActivity.java
ava/src/org/chromium/base/ChromiumApplication.java
ava/src/org/chromium/base/MemoryPressureListener.java
ava/src/org/chromium/base/PathUtils.java
ath_utils.cc
ath_utils.h
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
ava/src/org/chromium/base/ObserverList.java
avatests/src/org/chromium/base/ObserverListTest.java
ni_array.cc
ni_array.h
ni_array_unittest.cc
ni_generator/jni_generator.py
ni_generator/jni_generator_tests.py
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
ava/src/org/chromium/base/ApiCompatibilityUtils.java
ava/src/org/chromium/base/CollectionUtil.java
ni_android.cc
ni_android.h
bb1529ce867d8845a77ec7cdf3e3003ef1771a40 08-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216370

This commit was generated by merge_to_master.py.

Change-Id: I739228187a6f1df6c28c5761160e593a49891113
ase_jni_registrar.cc
ava/src/org/chromium/base/JavaHandlerThread.java
ava_handler_thread.cc
ava_handler_thread.h
a36e5920737c6adbddd3e43b760e5de8431db6e0 05-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
ase_jni_registrar.cc
bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3 25-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213605

This commit was generated by merge_to_master.py.

Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213
ava/src/org/chromium/base/ThreadUtils.java
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
ava/src/org/chromium/base/ApiCompatibilityUtils.java
ava/src/org/chromium/base/MemoryPressureListener.java
ava/src/org/chromium/base/SystemMessageHandler.java
ath_utils_unittest.cc
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
WNERS
ctivity_status_unittest.cc
ase_jni_registrar.cc
ava/src/org/chromium/base/MemoryPressureListener.java
ava/src/org/chromium/base/SysUtils.java
ys_utils.cc
ys_utils.h
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
ctivity_state_list.h
ase_jni_registrar.cc
ifo_utils.cc
ifo_utils.h
ava/src/org/chromium/base/ApiCompatibilityUtils.java
ava/src/org/chromium/base/MemoryPressureLevelList.template
ava/src/org/chromium/base/MemoryPressureListener.java
emory_pressure_listener_android.cc
emory_pressure_listener_android.h
5e3f23d412006dc4db4e659864679f29341e113f 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205548

This commit was generated by merge_to_master.py.

Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
ni_array.h
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
ava/src/org/chromium/base/ApiCompatibilityUtils.java
ni_generator/jni_generator.py
ni_generator/jni_generator_tests.py
ni_string.cc
ni_string_unittest.cc
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
ava/src/org/chromium/base/BuildInfo.java
ni_array.cc
ni_array.h
ni_array_unittest.cc
b2df76ea8fec9e32f6f3718986dba0d95315b29c 13-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
ase_jni_registrar.cc
ontext_types.cc
ontext_types.h
ava/src/org/chromium/base/ContextTypes.java
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
ctivity_state_list.h
ctivity_status.cc
ctivity_status.h
ctivity_status_unittest.cc
ase_jni_registrar.cc
ava/src/org/chromium/base/ActivityState.template
ava/src/org/chromium/base/ActivityStatus.java
ava/src/org/chromium/base/LocaleUtils.java
ava/src/org/chromium/base/PathUtils.java
ava/src/org/chromium/base/PowerMonitor.java
ava/src/org/chromium/base/PowerStatusReceiver.java
ava/src/org/chromium/base/SystemMonitor.java
ni_android.cc
ni_android.h
ni_generator/golden_sample_for_tests_jni.h
ni_generator/jni_generator.py
ni_generator/jni_generator_tests.py
ni_registrar.cc
ni_string.h
ocale_utils.cc
ocale_utils.h
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
WNERS
ase_jni_registrar.cc
uild_info.cc
uild_info.h
pu_features.cc
pu_features.h
mportant_file_writer_android.cc
mportant_file_writer_android.h
ava/src/org/chromium/base/AccessedByNative.java
ava/src/org/chromium/base/ActivityStatus.java
ava/src/org/chromium/base/BuildInfo.java
ava/src/org/chromium/base/CalledByNative.java
ava/src/org/chromium/base/CalledByNativeUnchecked.java
ava/src/org/chromium/base/ChromiumActivity.java
ava/src/org/chromium/base/ContextTypes.java
ava/src/org/chromium/base/CpuFeatures.java
ava/src/org/chromium/base/ImportantFileWriterAndroid.java
ava/src/org/chromium/base/LocaleUtils.java
ava/src/org/chromium/base/ObserverList.java
ava/src/org/chromium/base/PathUtils.java
ava/src/org/chromium/base/SystemMonitor.java
ava/src/org/chromium/base/ThreadUtils.java
avatests/src/org/chromium/base/ContextTypesTest.java
avatests/src/org/chromium/base/ObserverListTest.java
ni_array.cc
ni_array.h
ni_array_unittest.cc
ni_generator/SampleForTests.java
ni_generator/golden_sample_for_tests_jni.h
ni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java
ni_generator/jni_generator.gyp
ni_generator/jni_generator.py
ni_generator/jni_generator_tests.py
ni_generator/sample_for_tests.cc
ni_generator/sample_for_tests.h
ni_helper.cc
ni_registrar.cc
ni_string.cc
ni_string.h
ni_string_unittest.cc
ocale_utils.cc
ath_service_android.cc
ath_utils.cc
ath_utils.h
ath_utils_unittest.cc
hread_utils.h
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
WNERS
ase_jni_registrar.cc
ase_jni_registrar.h
uild_info.cc
uild_info.h
ava/src/org/chromium/base/AccessedByNative.java
ava/src/org/chromium/base/ActivityStatus.java
ava/src/org/chromium/base/BuildInfo.java
ava/src/org/chromium/base/CalledByNative.java
ava/src/org/chromium/base/CalledByNativeUnchecked.java
ava/src/org/chromium/base/JNINamespace.java
ava/src/org/chromium/base/LocaleUtils.java
ava/src/org/chromium/base/NativeClassQualifiedName.java
ava/src/org/chromium/base/PathService.java
ava/src/org/chromium/base/PathUtils.java
ava/src/org/chromium/base/PowerStatusReceiver.java
ava/src/org/chromium/base/SystemMessageHandler.java
ava/src/org/chromium/base/SystemMonitor.java
ava/src/org/chromium/base/ThreadUtils.java
ava/src/org/chromium/base/WeakContext.java
ni_android.cc
ni_android.h
ni_android_unittest.cc
ni_array.cc
ni_array.h
ni_array_unittest.cc
ni_generator/SampleForTests.java
ni_generator/golden_sample_for_tests_jni.h
ni_generator/jni_generator.gyp
ni_generator/jni_generator.py
ni_generator/jni_generator_tests.py
ni_generator/sample_for_tests.cc
ni_helper.cc
ni_helper.h
ni_registrar.cc
ni_registrar.h
ni_string.cc
ni_string.h
ocale_utils.cc
ocale_utils.h
ath_service_android.cc
ath_service_android.h
ath_utils.cc
ath_utils.h
ath_utils_unittest.cc
coped_java_ref.cc
coped_java_ref.h
coped_java_ref_unittest.cc