Merge IBusContorllerBase into IBusControllerImpl.

chrome/browser/chromeos/input_method/ibus_controller_base.h

Index: chrome/browser/chromeos/input_method/ibus_controller_base.h
diff --git a/chrome/browser/chromeos/input_method/ibus_controller_base.h b/chrome/browser/chromeos/input_method/ibus_controller_base.h
deleted file mode 100644
index 3e238e24b23326c5f9cb68cb819f04d839977f3f..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/input_method/ibus_controller_base.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_BASE_H_
-#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_BASE_H_
-
-#include <utility>
-
-#include "base/observer_list.h"
-#include "chrome/browser/chromeos/input_method/ibus_controller.h"
-#include "chromeos/ime/input_method_property.h"
-
-namespace chromeos {
-namespace input_method {
-
-// The common implementation of the IBusController. This file does not depend on
-// libibus, hence is unit-testable.
-class IBusControllerBase : public IBusController {
- public:
-  IBusControllerBase();
-  virtual ~IBusControllerBase();
-
-  // IBusController overrides. Derived classes should not override these 4
-  // functions.
-  virtual void AddObserver(Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(Observer* observer) OVERRIDE;
-  virtual const InputMethodPropertyList& GetCurrentProperties() const OVERRIDE;
-  virtual void ClearProperties() OVERRIDE;
-
- protected:
-  ObserverList<Observer> observers_;
-
-  // The value which will be returned by GetCurrentProperties(). Derived classes
-  // should update this variable when needed.
-  InputMethodPropertyList current_property_list_;
-
-  DISALLOW_COPY_AND_ASSIGN(IBusControllerBase);
-};
-
-}  // namespace input_method
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_BASE_H_