Merge IBusContorllerBase into IBusControllerImpl.

chrome/chrome_browser_chromeos.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.
 
 {
   'targets': [
     {
       'target_name': 'browser_chromeos',
       'type': 'static_library',
@@ skipping 371 matching lines @@
         'browser/chromeos/input_method/candidate_window_controller_impl.cc',
         'browser/chromeos/input_method/candidate_window_controller_impl.h',
         'browser/chromeos/input_method/candidate_window_view.cc',
         'browser/chromeos/input_method/candidate_window_view.h',
         'browser/chromeos/input_method/delayable_widget.cc',
         'browser/chromeos/input_method/delayable_widget.h',
         'browser/chromeos/input_method/hidable_area.cc',
         'browser/chromeos/input_method/hidable_area.h',
         'browser/chromeos/input_method/ibus_controller.cc',
         'browser/chromeos/input_method/ibus_controller.h',
-        'browser/chromeos/input_method/ibus_controller_base.cc',
-        'browser/chromeos/input_method/ibus_controller_base.h',
         'browser/chromeos/input_method/ibus_controller_impl.cc',
         'browser/chromeos/input_method/ibus_controller_impl.h',
         'browser/chromeos/input_method/infolist_window_view.cc',
         'browser/chromeos/input_method/infolist_window_view.h',
         'browser/chromeos/input_method/input_method_engine_ibus.cc',
         'browser/chromeos/input_method/input_method_engine_ibus.h',
         'browser/chromeos/input_method/input_method_configuration.cc',
         'browser/chromeos/input_method/input_method_configuration.h',
         'browser/chromeos/input_method/input_method_delegate_impl.cc',
         'browser/chromeos/input_method/input_method_delegate_impl.h',
@@ skipping 573 matching lines @@
         'browser/chromeos/attestation/attestation_key_payload.proto',
       ],
       'variables': {
         'proto_in_dir': 'browser/chromeos/attestation',
         'proto_out_dir': 'chrome/browser/chromeos/attestation',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }