Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

base/base.gypi

 # 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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
       'base_i18n_target': 0,
     },
@@ skipping 26 matching lines @@
           'android/fifo_utils.cc',
           'android/fifo_utils.h',
           'android/important_file_writer_android.cc',
           'android/important_file_writer_android.h',
           'android/java_handler_thread.cc',
           'android/java_handler_thread.h',
           'android/jni_android.cc',
           'android/jni_android.h',
           'android/jni_array.cc',
           'android/jni_array.h',
+          'android/jni_onload_delegate.h',
           'android/jni_registrar.cc',
           'android/jni_registrar.h',
           'android/jni_string.cc',
           'android/jni_string.h',
           'android/jni_utils.cc',
           'android/jni_utils.h',
           'android/jni_weak_ref.cc',
           'android/jni_weak_ref.h',
           'android/library_loader/library_load_from_apk_status_codes.h',
           'android/library_loader/library_loader_hooks.cc',
@@ skipping 607 matching lines @@
           'timer/hi_res_timer_manager_win.cc',
           'timer/mock_timer.cc',
           'timer/mock_timer.h',
           'timer/timer.cc',
           'timer/timer.h',
           'trace_event/memory_dump_manager.cc',
           'trace_event/memory_dump_manager.h',
           'trace_event/memory_dump_provider.h',
           'trace_event/process_memory_dump.cc',
           'trace_event/process_memory_dump.h',
-          'trace_event/process_memory_totals.cc',
-          'trace_event/process_memory_totals.h',
-          'trace_event/process_memory_totals_dump_provider.cc',
-          'trace_event/process_memory_totals_dump_provider.h',
           'trace_event/trace_event.h',
           'trace_event/trace_event_android.cc',
           'trace_event/trace_event_argument.cc',
           'trace_event/trace_event_argument.h',
           'trace_event/trace_event_impl.cc',
           'trace_event/trace_event_impl.h',
           'trace_event/trace_event_impl_constants.cc',
           'trace_event/trace_event_memory.cc',
           'trace_event/trace_event_memory.h',
           'trace_event/trace_event_synthetic_delay.cc',
@@ skipping 358 matching lines @@
           'i18n/time_formatting.h',
           'i18n/timezone.cc',
           'i18n/timezone.h',
           'i18n/utf8_validator_tables.cc',
           'i18n/utf8_validator_tables.h',
         ],
       }]
     ],
   },
 }