Commit 9cb7a4f6 authored by Bao-Duy Tran's avatar Bao-Duy Tran Committed by Commit Bot

Rename MockComponentExtIMEManagerDelegate to match its interface.

This is a mock for ComponentExtensionIMEManagerDelegate interface, so
had better be named after it with just a prefix "Mock" added, for some
little consistency that would facilitate code browsing and readability.

It's not quite worth it to shorten "Extension" to "Ext" for small length
savings on a test-only thing, while adversely impacting consistency.
It's out of scope here to make conciseness improvement to the existing
naming scheme of this whole family of interfaces and classes.

The rename here also makes it precisely consistent with the names of .h
and .cc files where the Mock is declared and defined.

Bug: 1134465
Change-Id: Ie8ed0d1ee39813ae722e677c4a58628a8e49d52b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2442649
Auto-Submit: Bao-Duy Tran <tranbaoduy@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarKeith Lee <keithlee@chromium.org>
Commit-Queue: Bao-Duy Tran <tranbaoduy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817272}
parent 7a3de396
...@@ -54,7 +54,7 @@ enum CallsBitmap { ...@@ -54,7 +54,7 @@ enum CallsBitmap {
void InitInputMethod() { void InitInputMethod() {
auto* comp_ime_manager = new ComponentExtensionIMEManager; auto* comp_ime_manager = new ComponentExtensionIMEManager;
auto* delegate = new MockComponentExtIMEManagerDelegate; auto* delegate = new MockComponentExtensionIMEManagerDelegate;
ComponentExtensionIME ext1; ComponentExtensionIME ext1;
ext1.id = kTestExtensionId; ext1.id = kTestExtensionId;
......
...@@ -188,7 +188,7 @@ class InputMethodManagerImplTest : public BrowserWithTestWindowTest { ...@@ -188,7 +188,7 @@ class InputMethodManagerImplTest : public BrowserWithTestWindowTest {
protected: protected:
// Helper function to initialize component extension stuff for testing. // Helper function to initialize component extension stuff for testing.
void InitComponentExtension() { void InitComponentExtension() {
mock_delegate_ = new MockComponentExtIMEManagerDelegate(); mock_delegate_ = new MockComponentExtensionIMEManagerDelegate();
mock_delegate_->set_ime_list(ime_list_); mock_delegate_->set_ime_list(ime_list_);
std::unique_ptr<ComponentExtensionIMEManagerDelegate> delegate( std::unique_ptr<ComponentExtensionIMEManagerDelegate> delegate(
mock_delegate_); mock_delegate_);
...@@ -368,7 +368,7 @@ class InputMethodManagerImplTest : public BrowserWithTestWindowTest { ...@@ -368,7 +368,7 @@ class InputMethodManagerImplTest : public BrowserWithTestWindowTest {
MockCandidateWindowController* candidate_window_controller_; MockCandidateWindowController* candidate_window_controller_;
std::unique_ptr<MockInputMethodEngine> mock_engine_handler_; std::unique_ptr<MockInputMethodEngine> mock_engine_handler_;
FakeImeKeyboard* keyboard_; FakeImeKeyboard* keyboard_;
MockComponentExtIMEManagerDelegate* mock_delegate_; MockComponentExtensionIMEManagerDelegate* mock_delegate_;
std::vector<ComponentExtensionIME> ime_list_; std::vector<ComponentExtensionIME> ime_list_;
ui::ime::InputMethodMenuManager* menu_manager_; ui::ime::InputMethodMenuManager* menu_manager_;
......
...@@ -253,8 +253,8 @@ class InputMethodPreferencesTest : public PreferencesTest { ...@@ -253,8 +253,8 @@ class InputMethodPreferencesTest : public PreferencesTest {
void InitComponentExtensionIMEManager() { void InitComponentExtensionIMEManager() {
// Set our custom IME list on the mock delegate. // Set our custom IME list on the mock delegate.
input_method::MockComponentExtIMEManagerDelegate* mock_delegate = input_method::MockComponentExtensionIMEManagerDelegate* mock_delegate =
new input_method::MockComponentExtIMEManagerDelegate(); new input_method::MockComponentExtensionIMEManagerDelegate();
mock_delegate->set_ime_list(CreateImeList()); mock_delegate->set_ime_list(CreateImeList());
// Pass the mock delegate to a new ComponentExtensionIMEManager. // Pass the mock delegate to a new ComponentExtensionIMEManager.
......
...@@ -367,7 +367,7 @@ class TestInputMethodManager : public input_method::MockInputMethodManager { ...@@ -367,7 +367,7 @@ class TestInputMethodManager : public input_method::MockInputMethodManager {
TestInputMethodManager() : state_(new TestState), util_(&delegate_) { TestInputMethodManager() : state_(new TestState), util_(&delegate_) {
util_.AppendInputMethods(state_->input_methods_); util_.AppendInputMethods(state_->input_methods_);
mock_delegate_ = mock_delegate_ =
new chromeos::input_method::MockComponentExtIMEManagerDelegate(); new chromeos::input_method::MockComponentExtensionIMEManagerDelegate();
component_ext_mgr_ = component_ext_mgr_ =
std::make_unique<chromeos::ComponentExtensionIMEManager>(); std::make_unique<chromeos::ComponentExtensionIMEManager>();
component_ext_mgr_->Initialize(base::WrapUnique(mock_delegate_)); component_ext_mgr_->Initialize(base::WrapUnique(mock_delegate_));
...@@ -391,7 +391,8 @@ class TestInputMethodManager : public input_method::MockInputMethodManager { ...@@ -391,7 +391,8 @@ class TestInputMethodManager : public input_method::MockInputMethodManager {
input_method::FakeInputMethodDelegate delegate_; input_method::FakeInputMethodDelegate delegate_;
input_method::InputMethodUtil util_; input_method::InputMethodUtil util_;
std::unique_ptr<chromeos::ComponentExtensionIMEManager> component_ext_mgr_; std::unique_ptr<chromeos::ComponentExtensionIMEManager> component_ext_mgr_;
chromeos::input_method::MockComponentExtIMEManagerDelegate* mock_delegate_; chromeos::input_method::MockComponentExtensionIMEManagerDelegate*
mock_delegate_;
DISALLOW_COPY_AND_ASSIGN(TestInputMethodManager); DISALLOW_COPY_AND_ASSIGN(TestInputMethodManager);
}; };
......
...@@ -8,19 +8,21 @@ ...@@ -8,19 +8,21 @@
namespace chromeos { namespace chromeos {
namespace input_method { namespace input_method {
MockComponentExtIMEManagerDelegate::MockComponentExtIMEManagerDelegate() {} MockComponentExtensionIMEManagerDelegate::
MockComponentExtensionIMEManagerDelegate() {}
MockComponentExtIMEManagerDelegate::~MockComponentExtIMEManagerDelegate() = MockComponentExtensionIMEManagerDelegate::
default; ~MockComponentExtensionIMEManagerDelegate() = default;
std::vector<ComponentExtensionIME> std::vector<ComponentExtensionIME>
MockComponentExtIMEManagerDelegate::ListIME() { MockComponentExtensionIMEManagerDelegate::ListIME() {
return ime_list_; return ime_list_;
} }
void MockComponentExtIMEManagerDelegate::Load(Profile* profile, void MockComponentExtensionIMEManagerDelegate::Load(
const std::string& extension_id, Profile* profile,
const std::string& manifest, const std::string& extension_id,
const base::FilePath& path) {} const std::string& manifest,
const base::FilePath& path) {}
} // namespace input_method } // namespace input_method
} // namespace chromeos } // namespace chromeos
...@@ -12,11 +12,12 @@ ...@@ -12,11 +12,12 @@
namespace chromeos { namespace chromeos {
namespace input_method { namespace input_method {
class COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS) MockComponentExtIMEManagerDelegate class COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS)
MockComponentExtensionIMEManagerDelegate
: public ComponentExtensionIMEManagerDelegate { : public ComponentExtensionIMEManagerDelegate {
public: public:
MockComponentExtIMEManagerDelegate(); MockComponentExtensionIMEManagerDelegate();
~MockComponentExtIMEManagerDelegate() override; ~MockComponentExtensionIMEManagerDelegate() override;
std::vector<ComponentExtensionIME> ListIME() override; std::vector<ComponentExtensionIME> ListIME() override;
void Load(Profile*, void Load(Profile*,
...@@ -31,7 +32,7 @@ class COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS) MockComponentExtIMEManagerDelegate ...@@ -31,7 +32,7 @@ class COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS) MockComponentExtIMEManagerDelegate
private: private:
std::vector<ComponentExtensionIME> ime_list_; std::vector<ComponentExtensionIME> ime_list_;
DISALLOW_COPY_AND_ASSIGN(MockComponentExtIMEManagerDelegate); DISALLOW_COPY_AND_ASSIGN(MockComponentExtensionIMEManagerDelegate);
}; };
} // namespace input_method } // namespace input_method
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment