diff options
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/chromeos.gyp | 5 | ||||
| -rw-r--r-- | chromeos/dbus/dbus_thread_manager.cc | 8 | ||||
| -rw-r--r-- | chromeos/dbus/dbus_thread_manager.h | 2 | ||||
| -rw-r--r-- | chromeos/dbus/ibus/ibus_config_client.cc | 318 | ||||
| -rw-r--r-- | chromeos/dbus/ibus/ibus_config_client.h | 77 | ||||
| -rw-r--r-- | chromeos/dbus/ibus/ibus_config_client_unittest.cc | 627 | ||||
| -rw-r--r-- | chromeos/dbus/ibus/mock_ibus_config_client.cc | 44 | ||||
| -rw-r--r-- | chromeos/dbus/ibus/mock_ibus_config_client.h | 47 | ||||
| -rw-r--r-- | chromeos/dbus/mock_dbus_thread_manager.cc | 1 | ||||
| -rw-r--r-- | chromeos/dbus/mock_dbus_thread_manager.h | 1 | ||||
| -rw-r--r-- | chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc | 6 | ||||
| -rw-r--r-- | chromeos/dbus/mock_dbus_thread_manager_without_gmock.h | 7 | ||||
| -rw-r--r-- | chromeos/ime/input_method_manager.h | 6 |
13 files changed, 0 insertions, 1149 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp index 9082a52..dae10d7 100644 --- a/chromeos/chromeos.gyp +++ b/chromeos/chromeos.gyp @@ -141,8 +141,6 @@ 'dbus/ibus/ibus_client.h', 'dbus/ibus/ibus_component.cc', 'dbus/ibus/ibus_component.h', - 'dbus/ibus/ibus_config_client.cc', - 'dbus/ibus/ibus_config_client.h', 'dbus/ibus/ibus_constants.h', 'dbus/ibus/ibus_engine_service.cc', 'dbus/ibus/ibus_engine_service.h', @@ -428,8 +426,6 @@ 'dbus/mock_dbus_thread_manager_without_gmock.h', 'dbus/ibus/mock_ibus_client.cc', 'dbus/ibus/mock_ibus_client.h', - 'dbus/ibus/mock_ibus_config_client.cc', - 'dbus/ibus/mock_ibus_config_client.h', 'dbus/ibus/mock_ibus_input_context_client.cc', 'dbus/ibus/mock_ibus_input_context_client.h', 'dbus/ibus/mock_ibus_engine_factory_service.cc', @@ -476,7 +472,6 @@ 'dbus/gsm_sms_client_unittest.cc', 'dbus/ibus/ibus_client_unittest.cc', 'dbus/ibus/ibus_component_unittest.cc', - 'dbus/ibus/ibus_config_client_unittest.cc', 'dbus/ibus/ibus_engine_factory_service_unittest.cc', 'dbus/ibus/ibus_engine_service_unittest.cc', 'dbus/ibus/ibus_input_context_client_unittest.cc', diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc index 9404f3e..70ed816 100644 --- a/chromeos/dbus/dbus_thread_manager.cc +++ b/chromeos/dbus/dbus_thread_manager.cc @@ -30,7 +30,6 @@ #include "chromeos/dbus/shill_service_client.h" #include "chromeos/dbus/system_clock_client.h" #include "chromeos/dbus/ibus/ibus_client.h" -#include "chromeos/dbus/ibus/ibus_config_client.h" #include "chromeos/dbus/ibus/ibus_engine_factory_service.h" #include "chromeos/dbus/ibus/ibus_engine_service.h" #include "chromeos/dbus/ibus/ibus_input_context_client.h" @@ -205,8 +204,6 @@ class DBusThreadManagerImpl : public DBusThreadManager { ibus_client_.reset( IBusClient::Create(client_type, ibus_bus_.get())); - ibus_config_client_.reset( - IBusConfigClient::Create(client_type, ibus_bus_.get())); ibus_input_context_client_.reset( IBusInputContextClient::Create(client_type)); ibus_engine_factory_service_.reset( @@ -334,10 +331,6 @@ class DBusThreadManagerImpl : public DBusThreadManager { return ibus_client_.get(); } - virtual IBusConfigClient* GetIBusConfigClient() OVERRIDE { - return ibus_config_client_.get(); - } - virtual IBusInputContextClient* GetIBusInputContextClient() OVERRIDE { return ibus_input_context_client_.get(); } @@ -407,7 +400,6 @@ class DBusThreadManagerImpl : public DBusThreadManager { scoped_ptr<SMSClient> sms_client_; scoped_ptr<UpdateEngineClient> update_engine_client_; scoped_ptr<IBusClient> ibus_client_; - scoped_ptr<IBusConfigClient> ibus_config_client_; scoped_ptr<IBusInputContextClient> ibus_input_context_client_; scoped_ptr<IBusEngineFactoryService> ibus_engine_factory_service_; std::map<dbus::ObjectPath, IBusEngineService*> ibus_engine_services_; diff --git a/chromeos/dbus/dbus_thread_manager.h b/chromeos/dbus/dbus_thread_manager.h index 07894ef..6d918af 100644 --- a/chromeos/dbus/dbus_thread_manager.h +++ b/chromeos/dbus/dbus_thread_manager.h @@ -37,7 +37,6 @@ class CryptohomeClient; class DebugDaemonClient; class GsmSMSClient; class IBusClient; -class IBusConfigClient; class IBusEngineFactoryService; class IBusEngineService; class IBusInputContextClient; @@ -131,7 +130,6 @@ class CHROMEOS_EXPORT DBusThreadManager { virtual DebugDaemonClient* GetDebugDaemonClient() = 0; virtual GsmSMSClient* GetGsmSMSClient() = 0; virtual IBusClient* GetIBusClient() = 0; - virtual IBusConfigClient* GetIBusConfigClient() = 0; virtual IBusEngineFactoryService* GetIBusEngineFactoryService() = 0; virtual IBusEngineService* GetIBusEngineService( const dbus::ObjectPath& object_path) = 0; diff --git a/chromeos/dbus/ibus/ibus_config_client.cc b/chromeos/dbus/ibus/ibus_config_client.cc deleted file mode 100644 index 1e01d27..0000000 --- a/chromeos/dbus/ibus/ibus_config_client.cc +++ /dev/null @@ -1,318 +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. - -#include "chromeos/dbus/ibus/ibus_config_client.h" - -#include <vector> - -#include "base/bind.h" -#include "base/callback.h" -#include "chromeos/dbus/ibus/ibus_constants.h" -#include "chromeos/dbus/ibus/ibus_component.h" -#include "dbus/bus.h" -#include "dbus/message.h" -#include "dbus/object_path.h" -#include "dbus/object_proxy.h" - -namespace chromeos { - -namespace { - -// Called when the |signal| is connected. -void OnSignalConnected(const std::string& interface, - const std::string& signal, - bool succeeded) { - LOG_IF(ERROR, !succeeded) << "Connect to " << interface << " " - << signal << " failed."; -} - -// Called when the GetNameOwner method call is failed. -void OnGetNameOwnerFail(dbus::ErrorResponse* response) { - // Do nothing, because method call sometimes fails due to bootstrap timing of - // ibus-memconf. -} - -// The IBusConfigClient implementation. -class IBusConfigClientImpl : public IBusConfigClient { - public: - explicit IBusConfigClientImpl(dbus::Bus* bus) - : proxy_(NULL), - bus_(bus), - weak_ptr_factory_(this) { - } - - virtual ~IBusConfigClientImpl() {} - - // IBusConfigClient override. - virtual void InitializeAsync(const OnIBusConfigReady& on_ready) OVERRIDE { - // We should check that the ibus-config daemon actually works first, so we - // can't initialize synchronously. - // NameOwnerChanged signal will be emitted by ibus-daemon, but from the - // service name kDBusServiceName instead of kServiceName. The signal will be - // used to detect start of ibus-daemon. - dbus::ObjectProxy* dbus_proxy = bus_->GetObjectProxy( - ibus::kDBusServiceName, - dbus::ObjectPath(ibus::kDBusObjectPath)); - - // Watch NameOwnerChanged signal which is fired when the ibus-config daemon - // request its name ownership. - dbus_proxy->ConnectToSignal( - ibus::kDBusInterface, - ibus::kNameOwnerChangedSignal, - base::Bind(&IBusConfigClientImpl::OnNameOwnerChanged, - weak_ptr_factory_.GetWeakPtr(), - on_ready), - base::Bind(&OnSignalConnected)); - - dbus::MethodCall method_call(ibus::kDBusInterface, - ibus::kGetNameOwnerMethod); - dbus::MessageWriter writer(&method_call); - writer.AppendString(ibus::config::kServiceName); - dbus_proxy->CallMethodWithErrorCallback( - &method_call, - dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, - base::Bind(&IBusConfigClientImpl::OnGetNameOwner, - weak_ptr_factory_.GetWeakPtr(), - on_ready), - base::Bind(&OnGetNameOwnerFail)); - } - - // IBusConfigClient override. - virtual void SetStringValue(const std::string& section, - const std::string& key, - const std::string& value, - const ErrorCallback& error_callback) OVERRIDE { - if (!proxy_) - return; - DCHECK(!error_callback.is_null()); - dbus::MethodCall method_call(ibus::config::kServiceInterface, - ibus::config::kSetValueMethod); - dbus::MessageWriter writer(&method_call); - writer.AppendString(section); - writer.AppendString(key); - dbus::MessageWriter variant_writer(NULL); - writer.OpenVariant("s", &variant_writer); - variant_writer.AppendString(value); - writer.CloseContainer(&variant_writer); - CallWithDefaultCallback(&method_call, error_callback); - } - - // IBusConfigClient override. - virtual void SetIntValue(const std::string& section, - const std::string& key, - int value, - const ErrorCallback& error_callback) OVERRIDE { - if (!proxy_) - return; - DCHECK(!error_callback.is_null()); - dbus::MethodCall method_call(ibus::config::kServiceInterface, - ibus::config::kSetValueMethod); - dbus::MessageWriter writer(&method_call); - writer.AppendString(section); - writer.AppendString(key); - dbus::MessageWriter variant_writer(NULL); - writer.OpenVariant("i", &variant_writer); - variant_writer.AppendInt32(value); - writer.CloseContainer(&variant_writer); - CallWithDefaultCallback(&method_call, error_callback); - } - - // IBusConfigClient override. - virtual void SetBoolValue(const std::string& section, - const std::string& key, - bool value, - const ErrorCallback& error_callback) OVERRIDE { - if (!proxy_) - return; - DCHECK(!error_callback.is_null()); - dbus::MethodCall method_call(ibus::config::kServiceInterface, - ibus::config::kSetValueMethod); - dbus::MessageWriter writer(&method_call); - writer.AppendString(section); - writer.AppendString(key); - dbus::MessageWriter variant_writer(NULL); - writer.OpenVariant("b", &variant_writer); - variant_writer.AppendBool(value); - writer.CloseContainer(&variant_writer); - CallWithDefaultCallback(&method_call, error_callback); - } - - // IBusConfigClient override. - virtual void SetStringListValue( - const std::string& section, - const std::string& key, - const std::vector<std::string>& value, - const ErrorCallback& error_callback) OVERRIDE { - if (!proxy_) - return; - DCHECK(!error_callback.is_null()); - dbus::MethodCall method_call(ibus::config::kServiceInterface, - ibus::config::kSetValueMethod); - dbus::MessageWriter writer(&method_call); - writer.AppendString(section); - writer.AppendString(key); - dbus::MessageWriter variant_writer(NULL); - dbus::MessageWriter array_writer(NULL); - - writer.OpenVariant("as", &variant_writer); - variant_writer.OpenArray("s", &array_writer); - for (size_t i = 0; i < value.size(); ++i) { - array_writer.AppendString(value[i]); - } - variant_writer.CloseContainer(&array_writer); - writer.CloseContainer(&variant_writer); - CallWithDefaultCallback(&method_call, error_callback); - } - - private: - void CallWithDefaultCallback(dbus::MethodCall* method_call, - const ErrorCallback& error_callback) { - if (!proxy_) - return; - proxy_->CallMethodWithErrorCallback( - method_call, - dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, - base::Bind(&IBusConfigClientImpl::OnSetValue, - weak_ptr_factory_.GetWeakPtr(), - error_callback), - base::Bind(&IBusConfigClientImpl::OnSetValueFail, - weak_ptr_factory_.GetWeakPtr(), - error_callback)); - } - - void OnSetValue(const ErrorCallback& error_callback, - dbus::Response* response) { - if (!response) { - LOG(ERROR) << "Response is NULL."; - error_callback.Run(); - return; - } - } - - void OnSetValueFail(const ErrorCallback& error_callback, - dbus::ErrorResponse* response) { - error_callback.Run(); - } - - void OnNameOwnerChanged(const OnIBusConfigReady& on_ready, - dbus::Signal* signal) { - DCHECK(signal); - std::string name; - std::string old_owner; - std::string new_owner; - - dbus::MessageReader reader(signal); - if (!reader.PopString(&name) || - !reader.PopString(&old_owner) || - !reader.PopString(&new_owner)) { - DLOG(ERROR) << "Invalid response of NameOwnerChanged." - << signal->ToString(); - return; - } - - if (name != ibus::config::kServiceName) - return; // Not a signal for ibus-config. - - if (!old_owner.empty() || new_owner.empty()) { - DVLOG(1) << "Unexpected name owner change: name=" << name - << ", old_owner=" << old_owner << ", new_owner=" << new_owner; - proxy_ = NULL; - return; - } - - if (proxy_) - return; // Already initialized. - - proxy_ = bus_->GetObjectProxy(ibus::config::kServiceName, - dbus::ObjectPath( - ibus::config::kServicePath)); - if (!on_ready.is_null()) - on_ready.Run(); - } - - // Handles response of GetNameOwner. - void OnGetNameOwner(const OnIBusConfigReady& on_ready, - dbus::Response* response) { - if (!response) { - LOG(ERROR) << "Response is NULL."; - return; - } - std::string owner; - dbus::MessageReader reader(response); - - if (!reader.PopString(&owner)) { - LOG(ERROR) << "Invalid response of GetNameOwner." - << response->ToString(); - return; - } - - // If the owner is empty, ibus-config daemon is not ready. So will - // initialize object proxy on NameOwnerChanged signal. - if (owner.empty()) - return; - - proxy_ = bus_->GetObjectProxy(ibus::config::kServiceName, - dbus::ObjectPath( - ibus::config::kServicePath)); - if (!on_ready.is_null()) - on_ready.Run(); - } - - dbus::ObjectProxy* proxy_; - dbus::Bus* bus_; - base::WeakPtrFactory<IBusConfigClientImpl> weak_ptr_factory_; - - DISALLOW_COPY_AND_ASSIGN(IBusConfigClientImpl); -}; - -// A stub implementation of IBusConfigClient. -// A configuration framework based on ibus will not be used after Extension IME -// migration. -class IBusConfigClientStubImpl : public IBusConfigClient { - public: - IBusConfigClientStubImpl() {} - virtual ~IBusConfigClientStubImpl() {} - virtual void InitializeAsync(const OnIBusConfigReady& on_ready) OVERRIDE {} - virtual void SetStringValue(const std::string& section, - const std::string& key, - const std::string& value, - const ErrorCallback& error_callback) OVERRIDE {} - virtual void SetIntValue(const std::string& section, - const std::string& key, - int value, - const ErrorCallback& error_callback) OVERRIDE {} - virtual void SetBoolValue(const std::string& section, - const std::string& key, - bool value, - const ErrorCallback& error_callback) OVERRIDE {} - virtual void SetStringListValue( - const std::string& section, - const std::string& key, - const std::vector<std::string>& value, - const ErrorCallback& error_callback) OVERRIDE {} - - private: - DISALLOW_COPY_AND_ASSIGN(IBusConfigClientStubImpl); -}; - -} // namespace - -/////////////////////////////////////////////////////////////////////////////// -// IBusConfigClient - -IBusConfigClient::IBusConfigClient() {} - -IBusConfigClient::~IBusConfigClient() {} - -// static -IBusConfigClient* IBusConfigClient::Create(DBusClientImplementationType type, - dbus::Bus* bus) { - if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) { - return new IBusConfigClientImpl(bus); - } - DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); - return new IBusConfigClientStubImpl(); -} - -} // namespace chromeos diff --git a/chromeos/dbus/ibus/ibus_config_client.h b/chromeos/dbus/ibus/ibus_config_client.h deleted file mode 100644 index a7a384a..0000000 --- a/chromeos/dbus/ibus/ibus_config_client.h +++ /dev/null @@ -1,77 +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 CHROMEOS_DBUS_IBUS_IBUS_CONFIG_CLIENT_H_ -#define CHROMEOS_DBUS_IBUS_IBUS_CONFIG_CLIENT_H_ - -#include <string> -#include <vector> - -#include "base/basictypes.h" -#include "base/callback.h" -#include "chromeos/chromeos_export.h" -#include "chromeos/dbus/dbus_client_implementation_type.h" -#include "dbus/object_path.h" - -namespace dbus { -class Bus; -} // namespace dbus - -namespace chromeos { - -class IBusComponent; -class IBusInputContextClient; - -// A class to make the actual DBus calls for IBusConfig service. -class CHROMEOS_EXPORT IBusConfigClient { - public: - typedef base::Callback<void()> ErrorCallback; - typedef base::Callback<void()> OnIBusConfigReady; - virtual ~IBusConfigClient(); - - // Initializes IBusConfig asynchronously. |on_ready| will be called if it is - // ready. - virtual void InitializeAsync(const OnIBusConfigReady& on_ready) = 0; - - // Requests the IBusConfig to set a string value. - virtual void SetStringValue(const std::string& section, - const std::string& key, - const std::string& value, - const ErrorCallback& error_callback) = 0; - - // Requests the IBusConfig to set a integer value. - virtual void SetIntValue(const std::string& section, - const std::string& key, - int value, - const ErrorCallback& error_callback) = 0; - - // Requests the IBusConfig to set a boolean value. - virtual void SetBoolValue(const std::string& section, - const std::string& key, - bool value, - const ErrorCallback& error_callback) = 0; - - // Requests the IBusConfig to set multiple string values. - virtual void SetStringListValue(const std::string& section, - const std::string& key, - const std::vector<std::string>& value, - const ErrorCallback& error_callback) = 0; - - // Factory function, creates a new instance and returns ownership. - // For normal usage, access the singleton via DBusThreadManager::Get(). - static CHROMEOS_EXPORT IBusConfigClient* Create( - DBusClientImplementationType type, - dbus::Bus* bus); - - protected: - // Create() should be used instead. - IBusConfigClient(); - - private: - DISALLOW_COPY_AND_ASSIGN(IBusConfigClient); -}; - -} // namespace chromeos - -#endif // CHROMEOS_DBUS_IBUS_IBUS_CONFIG_CLIENT_H_ diff --git a/chromeos/dbus/ibus/ibus_config_client_unittest.cc b/chromeos/dbus/ibus/ibus_config_client_unittest.cc deleted file mode 100644 index 656bf4d..0000000 --- a/chromeos/dbus/ibus/ibus_config_client_unittest.cc +++ /dev/null @@ -1,627 +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. - -#include "chromeos/dbus/ibus/ibus_config_client.h" - -#include <vector> - -#include "base/bind.h" -#include "base/message_loop/message_loop.h" -#include "base/values.h" -#include "chromeos/dbus/ibus/ibus_constants.h" -#include "dbus/message.h" -#include "dbus/mock_bus.h" -#include "dbus/mock_object_proxy.h" -#include "dbus/object_path.h" -#include "dbus/values_util.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" - -using testing::Invoke; -using testing::Return; -using testing::_; - -namespace { -const char kSection[] = "IBus/Section"; -const char kKey[] = "key"; - -enum HandlerBehavior { - HANDLER_SUCCESS, - HANDLER_FAIL, -}; -} // namespace - -namespace chromeos { - -class MockErrorCallback { - public: - MOCK_METHOD0(Run, void()); -}; - -class MockOnIBusConfigReadyCallback { - public: - MOCK_METHOD0(Run, void()); -}; - -// The base class of each type specified SetValue function handler. This class -// checks "section" and "key" field in SetValue message and callback success or -// error callback based on given |success| flag. -class SetValueVerifierBase { - public: - SetValueVerifierBase(const std::string& expected_section, - const std::string& expected_key, - HandlerBehavior behavior) - : expected_section_(expected_section), - expected_key_(expected_key), - behavior_(behavior) {} - - virtual ~SetValueVerifierBase() {} - - // Handles SetValue method call. This function checks "section" and "key" - // field. For the "value" field, subclass checks it with over riding - // VeirfyVariant member function. - void Run(dbus::MethodCall* method_call, - int timeout_ms, - const dbus::ObjectProxy::ResponseCallback& callback, - const dbus::ObjectProxy::ErrorCallback& error_callback) { - dbus::MessageReader reader(method_call); - std::string section; - std::string key; - - EXPECT_TRUE(reader.PopString(§ion)); - EXPECT_EQ(expected_section_, section); - EXPECT_TRUE(reader.PopString(&key)); - EXPECT_EQ(expected_key_, key); - dbus::MessageReader variant_reader(NULL); - EXPECT_TRUE(reader.PopVariant(&variant_reader)); - - VerifyVariant(&variant_reader); - - EXPECT_FALSE(reader.HasMoreData()); - if (behavior_ == HANDLER_SUCCESS) { - scoped_ptr<dbus::Response> response( - dbus::Response::FromMethodCall(method_call)); - callback.Run(response.get()); - } else { - scoped_ptr<dbus::ErrorResponse> error_response( - dbus::ErrorResponse::FromMethodCall(method_call, "Error", - "Error Message")); - error_callback.Run(error_response.get()); - } - } - - // Verifies "value" field in SetValue method call. - virtual void VerifyVariant(dbus::MessageReader* reader) = 0; - - private: - const std::string expected_section_; - const std::string expected_key_; - const HandlerBehavior behavior_; - - DISALLOW_COPY_AND_ASSIGN(SetValueVerifierBase); -}; - -// The class to verify SetStringValue method call arguments. -class SetStringValueHandler : public SetValueVerifierBase { - public: - SetStringValueHandler(const std::string& expected_key, - const std::string& expected_section, - const std::string& expected_value, - HandlerBehavior behavior) - : SetValueVerifierBase(expected_section, expected_key, behavior), - expected_value_(expected_value) {} - - - // SetValueVerifierBase override. - virtual void VerifyVariant(dbus::MessageReader* reader) OVERRIDE { - std::string value; - EXPECT_TRUE(reader->PopString(&value)); - EXPECT_EQ(expected_value_, value); - } - - private: - const std::string expected_value_; - - DISALLOW_COPY_AND_ASSIGN(SetStringValueHandler); -}; - -// The class to verify SetIntValue method call arguments. -class SetIntValueHandler : public SetValueVerifierBase { - public: - SetIntValueHandler(const std::string& expected_key, - const std::string& expected_section, - int expected_value, - HandlerBehavior behavior) - : SetValueVerifierBase(expected_section, expected_key, behavior), - expected_value_(expected_value) {} - - // SetValueVerifierBase override. - virtual void VerifyVariant(dbus::MessageReader* reader) OVERRIDE { - int value = -1; - EXPECT_TRUE(reader->PopInt32(&value)); - EXPECT_EQ(expected_value_, value); - } - - private: - const int expected_value_; - - DISALLOW_COPY_AND_ASSIGN(SetIntValueHandler); -}; - -// The class to verify SetBoolValue method call arguments. -class SetBoolValueHandler : public SetValueVerifierBase { - public: - SetBoolValueHandler(const std::string& expected_key, - const std::string& expected_section, - bool expected_value, - HandlerBehavior behavior) - : SetValueVerifierBase(expected_section, expected_key, behavior), - expected_value_(expected_value) {} - - // SetValueVerifierBase override. - virtual void VerifyVariant(dbus::MessageReader* reader) OVERRIDE { - bool value = false; - EXPECT_TRUE(reader->PopBool(&value)); - EXPECT_EQ(expected_value_, value); - } - - private: - const bool expected_value_; - - DISALLOW_COPY_AND_ASSIGN(SetBoolValueHandler); -}; - -// The class to verify SetStringListValue method call arguments. -class SetStringListValueHandler : public SetValueVerifierBase { - public: - SetStringListValueHandler(const std::string& expected_key, - const std::string& expected_section, - const std::vector<std::string>& expected_value, - HandlerBehavior behavior) - : SetValueVerifierBase(expected_section, expected_key, behavior), - expected_value_(expected_value) {} - - // SetValueVerifierBase override - virtual void VerifyVariant(dbus::MessageReader* reader) OVERRIDE { - dbus::MessageReader array_reader(NULL); - ASSERT_TRUE(reader->PopArray(&array_reader)); - for (size_t i = 0; i < expected_value_.size(); ++i) { - std::string value; - ASSERT_TRUE(array_reader.HasMoreData()); - EXPECT_TRUE(array_reader.PopString(&value)); - EXPECT_EQ(expected_value_[i], value); - } - EXPECT_FALSE(array_reader.HasMoreData()); - } - - private: - const std::vector<std::string>& expected_value_; - - DISALLOW_COPY_AND_ASSIGN(SetStringListValueHandler); -}; - -// The class verifies GetNameOwner method call and emits response callback -// asynchronouslly. -class MockGetNameOwnerMethodCallHandler { - public: - MockGetNameOwnerMethodCallHandler() {} - - // Handles CallMethod function. - void Run(dbus::MethodCall* method_call, - int timeout_ms, - const dbus::ObjectProxy::ResponseCallback& callback, - const dbus::ObjectProxy::ErrorCallback& error_callback) { - dbus::MessageReader reader(method_call); - std::string target_name; - EXPECT_TRUE(reader.PopString(&target_name)); - EXPECT_EQ(ibus::config::kServiceName, target_name); - EXPECT_FALSE(reader.HasMoreData()); - - callback_ = callback; - } - - // Invokes reply with given |callback_| in Run method. - void EmitReplyCallback(const std::string& owner) { - scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty()); - dbus::MessageWriter writer(response.get()); - writer.AppendString(owner); - callback_.Run(response.get()); - } - - private: - dbus::ObjectProxy::ResponseCallback callback_; - - DISALLOW_COPY_AND_ASSIGN(MockGetNameOwnerMethodCallHandler); -}; - - -// The class emulate GetNameOwner signal. -class NameOwnerChangedHandler { - public: - NameOwnerChangedHandler() {} - - // OnConnectToSignal mock function. - void OnConnectToSignal( - const std::string& interface_name, - const std::string& signal_name, - const dbus::ObjectProxy::SignalCallback& signal_callback, - const dbus::ObjectProxy::OnConnectedCallback& on_connected_callback) { - callback_ = signal_callback; - on_connected_callback.Run(interface_name, signal_name, true); - } - - // Invokes reply with given |callback_| in Run method. - void InvokeSignal(const std::string& name, - const std::string& old_owner, - const std::string& new_owner) { - dbus::Signal signal(ibus::kDBusInterface, ibus::kGetNameOwnerMethod); - dbus::MessageWriter writer(&signal); - writer.AppendString(name); - writer.AppendString(old_owner); - writer.AppendString(new_owner); - callback_.Run(&signal); - } - - private: - dbus::ObjectProxy::SignalCallback callback_; - - DISALLOW_COPY_AND_ASSIGN(NameOwnerChangedHandler); -}; - - -class IBusConfigClientTest : public testing::Test { - public: - IBusConfigClientTest() {} - - protected: - virtual void SetUp() OVERRIDE { - dbus::Bus::Options options; - mock_bus_ = new dbus::MockBus(options); - mock_proxy_ = new dbus::MockObjectProxy(mock_bus_.get(), - ibus::kServiceName, - dbus::ObjectPath( - ibus::config::kServicePath)); - EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock()); - client_.reset(IBusConfigClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION, - mock_bus_.get())); - - // Surpress uninteresting mock function call warning. - EXPECT_CALL(*mock_bus_.get(), AssertOnOriginThread()) - .WillRepeatedly(Return()); - } - - virtual void TearDown() OVERRIDE { - mock_bus_->ShutdownAndBlock(); - } - - // Initialize |client_| by replying valid owner name synchronously. - void InitializeSync() { - EXPECT_CALL(*mock_bus_.get(), - GetObjectProxy(ibus::config::kServiceName, - dbus::ObjectPath(ibus::config::kServicePath))) - .WillOnce(Return(mock_proxy_.get())); - - scoped_refptr<dbus::MockObjectProxy> mock_dbus_proxy - = new dbus::MockObjectProxy(mock_bus_.get(), - ibus::kDBusServiceName, - dbus::ObjectPath(ibus::kDBusObjectPath)); - EXPECT_CALL(*mock_bus_.get(), - GetObjectProxy(ibus::kDBusServiceName, - dbus::ObjectPath(ibus::kDBusObjectPath))) - .WillOnce(Return(mock_dbus_proxy.get())); - - MockGetNameOwnerMethodCallHandler mock_get_name_owner_method_call; - EXPECT_CALL(*mock_dbus_proxy.get(), CallMethodWithErrorCallback(_, _, _, _)) - .WillOnce(Invoke(&mock_get_name_owner_method_call, - &MockGetNameOwnerMethodCallHandler::Run)); - NameOwnerChangedHandler handler; - EXPECT_CALL(*mock_dbus_proxy.get(), - ConnectToSignal( - ibus::kDBusInterface, ibus::kNameOwnerChangedSignal, _, _)) - .WillOnce( - Invoke(&handler, &NameOwnerChangedHandler::OnConnectToSignal)); - client_->InitializeAsync(base::Bind(&base::DoNothing)); - mock_get_name_owner_method_call.EmitReplyCallback(":0.1"); - } - - // The IBus config client to be tested. - scoped_ptr<IBusConfigClient> client_; - - // A message loop to emulate asynchronous behavior. - base::MessageLoop message_loop_; - scoped_refptr<dbus::MockBus> mock_bus_; - scoped_refptr<dbus::MockObjectProxy> mock_proxy_; -}; - -TEST_F(IBusConfigClientTest, SetStringValueTest) { - // Set expectations - InitializeSync(); - const char value[] = "value"; - SetStringValueHandler handler(kSection, kKey, value, HANDLER_SUCCESS); - EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _)) - .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run)); - MockErrorCallback error_callback; - EXPECT_CALL(error_callback, Run()).Times(0); - - // Call SetStringValue. - client_->SetStringValue(kKey, kSection, value, - base::Bind(&MockErrorCallback::Run, - base::Unretained(&error_callback))); -} - -TEST_F(IBusConfigClientTest, SetStringValueTest_Fail) { - // Set expectations - InitializeSync(); - const char value[] = "value"; - SetStringValueHandler handler(kSection, kKey, value, HANDLER_FAIL); - EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _)) - .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run)); - MockErrorCallback error_callback; - EXPECT_CALL(error_callback, Run()); - - // Call SetStringValue. - client_->SetStringValue(kKey, kSection, value, - base::Bind(&MockErrorCallback::Run, - base::Unretained(&error_callback))); -} - -TEST_F(IBusConfigClientTest, SetIntValueTest) { - // Set expectations - InitializeSync(); - const int value = 1234; - SetIntValueHandler handler(kSection, kKey, value, HANDLER_SUCCESS); - EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _)) - .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run)); - MockErrorCallback error_callback; - EXPECT_CALL(error_callback, Run()).Times(0); - - // Call SetIntValue. - client_->SetIntValue(kKey, kSection, value, - base::Bind(&MockErrorCallback::Run, - base::Unretained(&error_callback))); -} - -TEST_F(IBusConfigClientTest, SetIntValueTest_Fail) { - // Set expectations - InitializeSync(); - const int value = 1234; - SetIntValueHandler handler(kSection, kKey, value, HANDLER_FAIL); - EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _)) - .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run)); - MockErrorCallback error_callback; - EXPECT_CALL(error_callback, Run()); - - // Call SetIntValue. - client_->SetIntValue(kKey, kSection, value, - base::Bind(&MockErrorCallback::Run, - base::Unretained(&error_callback))); -} - -TEST_F(IBusConfigClientTest, SetBoolValueTest) { - // Set expectations - InitializeSync(); - const bool value = true; - SetBoolValueHandler handler(kSection, kKey, value, HANDLER_SUCCESS); - EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _)) - .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run)); - MockErrorCallback error_callback; - EXPECT_CALL(error_callback, Run()).Times(0); - - // Call SetBoolValue. - client_->SetBoolValue(kKey, kSection, value, - base::Bind(&MockErrorCallback::Run, - base::Unretained(&error_callback))); -} - -TEST_F(IBusConfigClientTest, SetBoolValueTest_Fail) { - // Set expectations - InitializeSync(); - const bool value = true; - SetBoolValueHandler handler(kSection, kKey, value, HANDLER_FAIL); - EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _)) - .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run)); - MockErrorCallback error_callback; - EXPECT_CALL(error_callback, Run()); - - // Call SetBoolValue. - client_->SetBoolValue(kKey, kSection, value, - base::Bind(&MockErrorCallback::Run, - base::Unretained(&error_callback))); -} - -TEST_F(IBusConfigClientTest, SetStringListValueTest) { - // Set expectations - InitializeSync(); - std::vector<std::string> value; - value.push_back("Sample value 1"); - value.push_back("Sample value 2"); - - SetStringListValueHandler handler(kSection, kKey, value, HANDLER_SUCCESS); - EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _)) - .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run)); - MockErrorCallback error_callback; - EXPECT_CALL(error_callback, Run()).Times(0); - - // Call SetStringListValue. - client_->SetStringListValue(kKey, kSection, value, - base::Bind(&MockErrorCallback::Run, - base::Unretained(&error_callback))); -} - -TEST_F(IBusConfigClientTest, SetStringListValueTest_Fail) { - // Set expectations - InitializeSync(); - std::vector<std::string> value; - value.push_back("Sample value 1"); - value.push_back("Sample value 2"); - - SetStringListValueHandler handler(kSection, kKey, value, HANDLER_FAIL); - EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _)) - .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run)); - MockErrorCallback error_callback; - EXPECT_CALL(error_callback, Run()); - - // Call SetStringListValue. - client_->SetStringListValue(kKey, kSection, value, - base::Bind(&MockErrorCallback::Run, - base::Unretained(&error_callback))); -} - -TEST_F(IBusConfigClientTest, IBusConfigDaemon_NotAvailableTest) { - MockGetNameOwnerMethodCallHandler mock_get_name_owner_method_call; - - EXPECT_CALL(*mock_bus_.get(), - GetObjectProxy(ibus::kServiceName, - dbus::ObjectPath(ibus::config::kServicePath))) - .Times(0); - - scoped_refptr<dbus::MockObjectProxy> mock_dbus_proxy - = new dbus::MockObjectProxy(mock_bus_.get(), - ibus::kDBusServiceName, - dbus::ObjectPath(ibus::kDBusObjectPath)); - EXPECT_CALL(*mock_bus_.get(), - GetObjectProxy(ibus::kDBusServiceName, - dbus::ObjectPath(ibus::kDBusObjectPath))) - .WillOnce(Return(mock_dbus_proxy.get())); - EXPECT_CALL(*mock_dbus_proxy.get(), CallMethodWithErrorCallback(_, _, _, _)) - .WillOnce(Invoke(&mock_get_name_owner_method_call, - &MockGetNameOwnerMethodCallHandler::Run)); - NameOwnerChangedHandler handler; - EXPECT_CALL(*mock_dbus_proxy.get(), - ConnectToSignal( - ibus::kDBusInterface, ibus::kNameOwnerChangedSignal, _, _)) - .WillOnce(Invoke(&handler, &NameOwnerChangedHandler::OnConnectToSignal)); - client_->InitializeAsync(base::Bind(&base::DoNothing)); - - // Passing empty string means there is no owner, thus ibus-config daemon is - // not ready. - mock_get_name_owner_method_call.EmitReplyCallback(""); - - // Make sure not crashing by function call without initialize. - const bool value = true; - EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _)) - .Times(0); - MockErrorCallback error_callback; - EXPECT_CALL(error_callback, Run()).Times(0); - client_->SetBoolValue(kKey, kSection, value, - base::Bind(&MockErrorCallback::Run, - base::Unretained(&error_callback))); -} - -TEST_F(IBusConfigClientTest, IBusConfigDaemon_SlowInitializeTest) { - MockGetNameOwnerMethodCallHandler mock_get_name_owner_method_call; - - EXPECT_CALL(*mock_bus_.get(), - GetObjectProxy(ibus::config::kServiceName, - dbus::ObjectPath(ibus::config::kServicePath))) - .WillOnce(Return(mock_proxy_.get())); - - scoped_refptr<dbus::MockObjectProxy> mock_dbus_proxy - = new dbus::MockObjectProxy(mock_bus_.get(), - ibus::kDBusServiceName, - dbus::ObjectPath(ibus::kDBusObjectPath)); - EXPECT_CALL(*mock_bus_.get(), - GetObjectProxy(ibus::kDBusServiceName, - dbus::ObjectPath(ibus::kDBusObjectPath))) - .WillOnce(Return(mock_dbus_proxy.get())); - EXPECT_CALL(*mock_dbus_proxy.get(), CallMethodWithErrorCallback(_, _, _, _)) - .WillOnce(Invoke(&mock_get_name_owner_method_call, - &MockGetNameOwnerMethodCallHandler::Run)); - NameOwnerChangedHandler name_owner_changed_handler; - EXPECT_CALL(*mock_dbus_proxy.get(), - ConnectToSignal( - ibus::kDBusInterface, ibus::kNameOwnerChangedSignal, _, _)) - .WillOnce(Invoke(&name_owner_changed_handler, - &NameOwnerChangedHandler::OnConnectToSignal)); - client_->InitializeAsync(base::Bind(&base::DoNothing)); - - // Passing empty string means there is no owner, thus ibus-config daemon is - // not ready. - mock_get_name_owner_method_call.EmitReplyCallback(""); - - // Fire NameOwnerChanged signal to emulate ibus-config daemon was acquired - // well-known name. - name_owner_changed_handler.InvokeSignal(ibus::config::kServiceName, - "", - ":0.1"); - - // Make sure it is possible to emit method calls. - const bool value = true; - SetBoolValueHandler handler(kSection, kKey, value, HANDLER_FAIL); - EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _)) - .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run)); - MockErrorCallback error_callback; - EXPECT_CALL(error_callback, Run()); - - // Call SetBoolValue. - client_->SetBoolValue(kKey, kSection, value, - base::Bind(&MockErrorCallback::Run, - base::Unretained(&error_callback))); -} - -TEST_F(IBusConfigClientTest, IBusConfigDaemon_ShutdownTest) { - MockGetNameOwnerMethodCallHandler mock_get_name_owner_method_call; - - EXPECT_CALL(*mock_bus_.get(), - GetObjectProxy(ibus::config::kServiceName, - dbus::ObjectPath(ibus::config::kServicePath))) - .WillRepeatedly(Return(mock_proxy_.get())); - - scoped_refptr<dbus::MockObjectProxy> mock_dbus_proxy - = new dbus::MockObjectProxy(mock_bus_.get(), - ibus::kDBusServiceName, - dbus::ObjectPath(ibus::kDBusObjectPath)); - EXPECT_CALL(*mock_bus_.get(), - GetObjectProxy(ibus::kDBusServiceName, - dbus::ObjectPath(ibus::kDBusObjectPath))) - .WillOnce(Return(mock_dbus_proxy.get())); - EXPECT_CALL(*mock_dbus_proxy.get(), CallMethodWithErrorCallback(_, _, _, _)) - .WillOnce(Invoke(&mock_get_name_owner_method_call, - &MockGetNameOwnerMethodCallHandler::Run)); - NameOwnerChangedHandler name_owner_changed_handler; - EXPECT_CALL(*mock_dbus_proxy.get(), - ConnectToSignal( - ibus::kDBusInterface, ibus::kNameOwnerChangedSignal, _, _)) - .WillOnce(Invoke(&name_owner_changed_handler, - &NameOwnerChangedHandler::OnConnectToSignal)); - client_->InitializeAsync(base::Bind(&base::DoNothing)); - - const bool value = true; - SetBoolValueHandler handler(kSection, kKey, value, HANDLER_FAIL); - EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _)) - .WillRepeatedly(Invoke(&handler, &SetValueVerifierBase::Run)); - MockErrorCallback error_callback; - EXPECT_CALL(error_callback, Run()).WillRepeatedly(Return()); - - // Initialize succeeded sucessfully. - mock_get_name_owner_method_call.EmitReplyCallback(":0.2"); - - // Call SetBoolValue. - client_->SetBoolValue(kKey, kSection, value, - base::Bind(&MockErrorCallback::Run, - base::Unretained(&error_callback))); - - // Fire NameOwnerChanged signal to emulate shutting down the ibus-config - // daemon. - name_owner_changed_handler.InvokeSignal(ibus::config::kServiceName, - ":0.1", - ""); - - // Make sure not crashing on emitting method call. - client_->SetBoolValue(kKey, kSection, value, - base::Bind(&MockErrorCallback::Run, - base::Unretained(&error_callback))); - - // Fire NameOwnerChanged signal to emulate that ibus-daemon is revived. - name_owner_changed_handler.InvokeSignal(ibus::config::kServiceName, - "", - ":0.2"); - - // Make sure it is possible to emit method calls. - client_->SetBoolValue(kKey, kSection, value, - base::Bind(&MockErrorCallback::Run, - base::Unretained(&error_callback))); -} - -} // namespace chromeos diff --git a/chromeos/dbus/ibus/mock_ibus_config_client.cc b/chromeos/dbus/ibus/mock_ibus_config_client.cc deleted file mode 100644 index f32ffd0..0000000 --- a/chromeos/dbus/ibus/mock_ibus_config_client.cc +++ /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. - -#include "chromeos/dbus/ibus/mock_ibus_config_client.h" - -#include <vector> - -namespace chromeos { - -MockIBusConfigClient::MockIBusConfigClient() { -} - -MockIBusConfigClient::~MockIBusConfigClient() {} - -void MockIBusConfigClient::InitializeAsync(const OnIBusConfigReady& onready) { -} - -void MockIBusConfigClient::SetStringValue(const std::string& key, - const std::string& section, - const std::string& value, - const ErrorCallback& error_callback) { -} - -void MockIBusConfigClient::SetIntValue(const std::string& key, - const std::string& section, - int value, - const ErrorCallback& error_callback) { -} - -void MockIBusConfigClient::SetBoolValue(const std::string& key, - const std::string& section, - bool value, - const ErrorCallback& error_callback) { -} - -void MockIBusConfigClient::SetStringListValue( - const std::string& key, - const std::string& section, - const std::vector<std::string>& value, - const ErrorCallback& error_callback) { -} - -} // namespace chromeos diff --git a/chromeos/dbus/ibus/mock_ibus_config_client.h b/chromeos/dbus/ibus/mock_ibus_config_client.h deleted file mode 100644 index 2112dc1..0000000 --- a/chromeos/dbus/ibus/mock_ibus_config_client.h +++ /dev/null @@ -1,47 +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 CHROMEOS_DBUS_IBUS_MOCK_IBUS_CONFIG_CLIENT_H_ -#define CHROMEOS_DBUS_IBUS_MOCK_IBUS_CONFIG_CLIENT_H_ - -#include <string> -#include <vector> - -#include "chromeos/dbus/ibus/ibus_config_client.h" - -namespace chromeos { - -class MockIBusConfigClient : public IBusConfigClient { - public: - MockIBusConfigClient(); - virtual ~MockIBusConfigClient(); - virtual void InitializeAsync(const OnIBusConfigReady& onready) OVERRIDE; - - virtual void SetStringValue(const std::string& key, - const std::string& section, - const std::string& value, - const ErrorCallback& error_callback) OVERRIDE; - - virtual void SetIntValue(const std::string& key, - const std::string& section, - int value, - const ErrorCallback& error_callback) OVERRIDE; - - virtual void SetBoolValue(const std::string& key, - const std::string& section, - bool value, - const ErrorCallback& error_callback) OVERRIDE; - - virtual void SetStringListValue(const std::string& key, - const std::string& section, - const std::vector<std::string>& value, - const ErrorCallback& error_callback) OVERRIDE; - - private: - DISALLOW_COPY_AND_ASSIGN(MockIBusConfigClient); -}; - -} // namespace chromeos - -#endif // CHROMEOS_DBUS_IBUS_MOCK_IBUS_CONFIG_CLIENT_H_ diff --git a/chromeos/dbus/mock_dbus_thread_manager.cc b/chromeos/dbus/mock_dbus_thread_manager.cc index 6245e46..9cf664c 100644 --- a/chromeos/dbus/mock_dbus_thread_manager.cc +++ b/chromeos/dbus/mock_dbus_thread_manager.cc @@ -11,7 +11,6 @@ #include "chromeos/dbus/fake_bluetooth_input_client.h" #include "chromeos/dbus/fake_bluetooth_profile_manager_client.h" #include "chromeos/dbus/ibus/mock_ibus_client.h" -#include "chromeos/dbus/ibus/mock_ibus_config_client.h" #include "chromeos/dbus/ibus/mock_ibus_engine_factory_service.h" #include "chromeos/dbus/ibus/mock_ibus_engine_service.h" #include "chromeos/dbus/ibus/mock_ibus_input_context_client.h" diff --git a/chromeos/dbus/mock_dbus_thread_manager.h b/chromeos/dbus/mock_dbus_thread_manager.h index 60f61ee..16c4be1 100644 --- a/chromeos/dbus/mock_dbus_thread_manager.h +++ b/chromeos/dbus/mock_dbus_thread_manager.h @@ -79,7 +79,6 @@ class MockDBusThreadManager : public DBusThreadManager { MOCK_METHOD0(GetSystemClockClient, SystemClockClient*(void)); MOCK_METHOD0(GetUpdateEngineClient, UpdateEngineClient*(void)); MOCK_METHOD0(GetIBusClient, IBusClient*(void)); - MOCK_METHOD0(GetIBusConfigClient, IBusConfigClient*(void)); MOCK_METHOD0(GetIBusInputContextClient, IBusInputContextClient*(void)); MOCK_METHOD0(GetIBusEngineFactoryService, IBusEngineFactoryService*(void)); MOCK_METHOD1(GetIBusEngineService, diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc index 579d410..8bd95a1 100644 --- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc +++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc @@ -21,7 +21,6 @@ #include "chromeos/dbus/fake_system_clock_client.h" #include "chromeos/dbus/fake_update_engine_client.h" #include "chromeos/dbus/ibus/mock_ibus_client.h" -#include "chromeos/dbus/ibus/mock_ibus_config_client.h" #include "chromeos/dbus/ibus/mock_ibus_engine_factory_service.h" #include "chromeos/dbus/ibus/mock_ibus_engine_service.h" #include "chromeos/dbus/ibus/mock_ibus_input_context_client.h" @@ -75,7 +74,6 @@ void MockDBusThreadManagerWithoutGMock::InitIBusBus( // Non-null bus address is used to ensure the connection to ibus-daemon. ibus_bus_ = reinterpret_cast<dbus::Bus*>(0xdeadbeef); mock_ibus_client_.reset(new MockIBusClient); - mock_ibus_config_client_.reset(new MockIBusConfigClient); mock_ibus_input_context_client_.reset(new MockIBusInputContextClient); mock_ibus_engine_service_.reset(new MockIBusEngineService); mock_ibus_engine_factory_service_.reset(new MockIBusEngineFactoryService); @@ -217,10 +215,6 @@ IBusClient* MockDBusThreadManagerWithoutGMock::GetIBusClient() { return mock_ibus_client_.get(); } -IBusConfigClient* MockDBusThreadManagerWithoutGMock::GetIBusConfigClient() { - return mock_ibus_config_client_.get(); -} - IBusInputContextClient* MockDBusThreadManagerWithoutGMock::GetIBusInputContextClient() { return mock_ibus_input_context_client_.get(); diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h index f7c9479..f5c5841 100644 --- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h +++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h @@ -35,7 +35,6 @@ class FakeShillManagerClient; class FakeSystemClockClient; class FakeUpdateEngineClient; class MockIBusClient; -class MockIBusConfigClient; class MockIBusEngineFactoryService; class MockIBusEngineService; class MockIBusInputContextClient; @@ -86,7 +85,6 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager { virtual SystemClockClient* GetSystemClockClient() OVERRIDE; virtual UpdateEngineClient* GetUpdateEngineClient() OVERRIDE; virtual IBusClient* GetIBusClient() OVERRIDE; - virtual IBusConfigClient* GetIBusConfigClient() OVERRIDE; virtual IBusInputContextClient* GetIBusInputContextClient() OVERRIDE; virtual IBusEngineFactoryService* GetIBusEngineFactoryService() OVERRIDE; virtual IBusEngineService* GetIBusEngineService( @@ -159,10 +157,6 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager { return mock_ibus_client_.get(); } - MockIBusConfigClient* mock_ibus_config_client() { - return mock_ibus_config_client_.get(); - } - MockIBusInputContextClient* mock_ibus_input_context_client() { return mock_ibus_input_context_client_.get(); } @@ -207,7 +201,6 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager { scoped_ptr<FakeUpdateEngineClient> fake_update_engine_client_; scoped_ptr<MockIBusClient> mock_ibus_client_; - scoped_ptr<MockIBusConfigClient> mock_ibus_config_client_; scoped_ptr<MockIBusInputContextClient> mock_ibus_input_context_client_; scoped_ptr<MockIBusEngineService> mock_ibus_engine_service_; scoped_ptr<MockIBusEngineFactoryService> mock_ibus_engine_factory_service_; diff --git a/chromeos/ime/input_method_manager.h b/chromeos/ime/input_method_manager.h index 5a94455..7b18124 100644 --- a/chromeos/ime/input_method_manager.h +++ b/chromeos/ime/input_method_manager.h @@ -145,12 +145,6 @@ class CHROMEOS_EXPORT InputMethodManager { const std::string& keyboard_id, std::vector<std::string>* input_method_ids) = 0; - // Updates a configuration of a system input method engine with |value|. - // Returns true if the configuration is correctly set. - virtual bool SetInputMethodConfig(const std::string& section, - const std::string& config_name, - const InputMethodConfigValue& value) = 0; - // Adds an input method extension. This function does not takes ownership of // |instance|. virtual void AddInputMethodExtension( |