Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chromeos/dbus/ibus/ibus_panel_service_unittest.cc

Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/ibus/ibus_input_context_client_unittest.cc ('k') | chromeos/dbus/modem_messaging_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/ibus/ibus_panel_service_unittest.cc
diff --git a/chromeos/dbus/ibus/ibus_panel_service_unittest.cc b/chromeos/dbus/ibus/ibus_panel_service_unittest.cc
index ec7aa74673e50558e82cfce021f86a74cecd7170..66ee748da524414680634a7b301eb0c31c3ce73e 100644
--- a/chromeos/dbus/ibus/ibus_panel_service_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_panel_service_unittest.cc
@@ -223,71 +223,80 @@ class IBusPanelServiceTest : public testing::Test {
ibus::panel::kServicePath)))
.WillOnce(Return(mock_exported_object_.get()));
- EXPECT_CALL(*mock_exported_object_, ExportMethod(
- ibus::panel::kServiceInterface,
- ibus::panel::kUpdateLookupTableMethod, _, _))
- .WillRepeatedly(
- Invoke(this, &IBusPanelServiceTest::OnMethodExported));
-
- EXPECT_CALL(*mock_exported_object_, ExportMethod(
- ibus::panel::kServiceInterface,
- ibus::panel::kHideLookupTableMethod, _, _))
- .WillRepeatedly(
- Invoke(this, &IBusPanelServiceTest::OnMethodExported));
-
- EXPECT_CALL(*mock_exported_object_, ExportMethod(
- ibus::panel::kServiceInterface,
- ibus::panel::kUpdateAuxiliaryTextMethod, _, _))
- .WillRepeatedly(
- Invoke(this, &IBusPanelServiceTest::OnMethodExported));
-
- EXPECT_CALL(*mock_exported_object_, ExportMethod(
- ibus::panel::kServiceInterface,
- ibus::panel::kHideAuxiliaryTextMethod, _, _))
- .WillRepeatedly(
- Invoke(this, &IBusPanelServiceTest::OnMethodExported));
-
- EXPECT_CALL(*mock_exported_object_, ExportMethod(
- ibus::panel::kServiceInterface,
- ibus::panel::kUpdatePreeditTextMethod, _, _))
- .WillRepeatedly(
- Invoke(this, &IBusPanelServiceTest::OnMethodExported));
-
- EXPECT_CALL(*mock_exported_object_, ExportMethod(
- ibus::panel::kServiceInterface,
- ibus::panel::kHidePreeditTextMethod, _, _))
- .WillRepeatedly(
- Invoke(this, &IBusPanelServiceTest::OnMethodExported));
-
- EXPECT_CALL(*mock_exported_object_, ExportMethod(
- ibus::panel::kServiceInterface,
- ibus::panel::kRegisterPropertiesMethod, _, _))
- .WillRepeatedly(
- Invoke(this, &IBusPanelServiceTest::OnMethodExported));
-
- EXPECT_CALL(*mock_exported_object_, ExportMethod(
- ibus::panel::kServiceInterface,
- ibus::panel::kUpdatePropertyMethod, _, _))
- .WillRepeatedly(
- Invoke(this, &IBusPanelServiceTest::OnMethodExported));
-
- EXPECT_CALL(*mock_exported_object_, ExportMethod(
- ibus::panel::kServiceInterface,
- ibus::panel::kFocusInMethod, _, _))
- .WillRepeatedly(
- Invoke(this, &IBusPanelServiceTest::OnMethodExported));
-
- EXPECT_CALL(*mock_exported_object_, ExportMethod(
- ibus::panel::kServiceInterface,
- ibus::panel::kFocusOutMethod, _, _))
- .WillRepeatedly(
- Invoke(this, &IBusPanelServiceTest::OnMethodExported));
-
- EXPECT_CALL(*mock_exported_object_, ExportMethod(
- ibus::panel::kServiceInterface,
- ibus::panel::kStateChangedMethod, _, _))
- .WillRepeatedly(
- Invoke(this, &IBusPanelServiceTest::OnMethodExported));
+ EXPECT_CALL(*mock_exported_object_.get(),
+ ExportMethod(ibus::panel::kServiceInterface,
+ ibus::panel::kUpdateLookupTableMethod,
+ _,
+ _))
+ .WillRepeatedly(Invoke(this, &IBusPanelServiceTest::OnMethodExported));
+
+ EXPECT_CALL(*mock_exported_object_.get(),
+ ExportMethod(ibus::panel::kServiceInterface,
+ ibus::panel::kHideLookupTableMethod,
+ _,
+ _))
+ .WillRepeatedly(Invoke(this, &IBusPanelServiceTest::OnMethodExported));
+
+ EXPECT_CALL(*mock_exported_object_.get(),
+ ExportMethod(ibus::panel::kServiceInterface,
+ ibus::panel::kUpdateAuxiliaryTextMethod,
+ _,
+ _))
+ .WillRepeatedly(Invoke(this, &IBusPanelServiceTest::OnMethodExported));
+
+ EXPECT_CALL(*mock_exported_object_.get(),
+ ExportMethod(ibus::panel::kServiceInterface,
+ ibus::panel::kHideAuxiliaryTextMethod,
+ _,
+ _))
+ .WillRepeatedly(Invoke(this, &IBusPanelServiceTest::OnMethodExported));
+
+ EXPECT_CALL(*mock_exported_object_.get(),
+ ExportMethod(ibus::panel::kServiceInterface,
+ ibus::panel::kUpdatePreeditTextMethod,
+ _,
+ _))
+ .WillRepeatedly(Invoke(this, &IBusPanelServiceTest::OnMethodExported));
+
+ EXPECT_CALL(*mock_exported_object_.get(),
+ ExportMethod(ibus::panel::kServiceInterface,
+ ibus::panel::kHidePreeditTextMethod,
+ _,
+ _))
+ .WillRepeatedly(Invoke(this, &IBusPanelServiceTest::OnMethodExported));
+
+ EXPECT_CALL(*mock_exported_object_.get(),
+ ExportMethod(ibus::panel::kServiceInterface,
+ ibus::panel::kRegisterPropertiesMethod,
+ _,
+ _))
+ .WillRepeatedly(Invoke(this, &IBusPanelServiceTest::OnMethodExported));
+
+ EXPECT_CALL(*mock_exported_object_.get(),
+ ExportMethod(ibus::panel::kServiceInterface,
+ ibus::panel::kUpdatePropertyMethod,
+ _,
+ _))
+ .WillRepeatedly(Invoke(this, &IBusPanelServiceTest::OnMethodExported));
+
+ EXPECT_CALL(
+ *mock_exported_object_.get(),
+ ExportMethod(
+ ibus::panel::kServiceInterface, ibus::panel::kFocusInMethod, _, _))
+ .WillRepeatedly(Invoke(this, &IBusPanelServiceTest::OnMethodExported));
+
+ EXPECT_CALL(
+ *mock_exported_object_.get(),
+ ExportMethod(
+ ibus::panel::kServiceInterface, ibus::panel::kFocusOutMethod, _, _))
+ .WillRepeatedly(Invoke(this, &IBusPanelServiceTest::OnMethodExported));
+
+ EXPECT_CALL(*mock_exported_object_.get(),
+ ExportMethod(ibus::panel::kServiceInterface,
+ ibus::panel::kStateChangedMethod,
+ _,
+ _))
+ .WillRepeatedly(Invoke(this, &IBusPanelServiceTest::OnMethodExported));
// Suppress uninteresting mock function call warning.
EXPECT_CALL(*mock_bus_.get(),
@@ -520,7 +529,7 @@ TEST_F(IBusPanelServiceTest, UpdatePreeditTextTest) {
TEST_F(IBusPanelServiceTest, CursorUpTest) {
// Set expectations.
NullArgumentVerifier evaluator(ibus::panel::kCursorUpSignal);
- EXPECT_CALL(*mock_exported_object_, SendSignal(_))
+ EXPECT_CALL(*mock_exported_object_.get(), SendSignal(_))
.WillOnce(Invoke(&evaluator, &NullArgumentVerifier::Verify));
// Emit signal.
@@ -530,7 +539,7 @@ TEST_F(IBusPanelServiceTest, CursorUpTest) {
TEST_F(IBusPanelServiceTest, CursorDownTest) {
// Set expectations.
NullArgumentVerifier evaluator(ibus::panel::kCursorDownSignal);
- EXPECT_CALL(*mock_exported_object_, SendSignal(_))
+ EXPECT_CALL(*mock_exported_object_.get(), SendSignal(_))
.WillOnce(Invoke(&evaluator, &NullArgumentVerifier::Verify));
// Emit signal.
@@ -540,7 +549,7 @@ TEST_F(IBusPanelServiceTest, CursorDownTest) {
TEST_F(IBusPanelServiceTest, PageUpTest) {
// Set expectations.
NullArgumentVerifier evaluator(ibus::panel::kPageUpSignal);
- EXPECT_CALL(*mock_exported_object_, SendSignal(_))
+ EXPECT_CALL(*mock_exported_object_.get(), SendSignal(_))
.WillOnce(Invoke(&evaluator, &NullArgumentVerifier::Verify));
// Emit signal.
@@ -550,7 +559,7 @@ TEST_F(IBusPanelServiceTest, PageUpTest) {
TEST_F(IBusPanelServiceTest, PageDownTest) {
// Set expectations.
NullArgumentVerifier evaluator(ibus::panel::kPageDownSignal);
- EXPECT_CALL(*mock_exported_object_, SendSignal(_))
+ EXPECT_CALL(*mock_exported_object_.get(), SendSignal(_))
.WillOnce(Invoke(&evaluator, &NullArgumentVerifier::Verify));
// Emit signal.
« no previous file with comments | « chromeos/dbus/ibus/ibus_input_context_client_unittest.cc ('k') | chromeos/dbus/modem_messaging_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698