Support the ModemManager1 interfaces for SMS messages

chromeos/dbus/mock_modem_messaging_client.h

Index: chromeos/dbus/mock_modem_messaging_client.h
diff --git a/chromeos/dbus/mock_gsm_sms_client.h b/chromeos/dbus/mock_modem_messaging_client.h
similarity index 69%
copy from chromeos/dbus/mock_gsm_sms_client.h
copy to chromeos/dbus/mock_modem_messaging_client.h
index b7078d220d08b9b68b02f60a78328895a52af6c5..b7e2077610f75755c6e9fd5ce713e91a9f2dd2e9 100644
--- a/chromeos/dbus/mock_gsm_sms_client.h
+++ b/chromeos/dbus/mock_modem_messaging_client.h
@@ -2,21 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_DBUS_MOCK_GSM_SMS_CLIENT_H_
-#define CHROMEOS_DBUS_MOCK_GSM_SMS_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_MODEM_MESSAGING_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_MODEM_MESSAGING_CLIENT_H_
 #pragma once
 
+#include <string>
+
 #include "base/values.h"
-#include "chromeos/dbus/gsm_sms_client.h"
+#include "chromeos/dbus/modem_messaging_client.h"
 #include "dbus/object_path.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
 
-class MockGsmSMSClient : public GsmSMSClient {
+class MockModemMessagingClient : public ModemMessagingClient {
  public:
-  MockGsmSMSClient();
-  virtual ~MockGsmSMSClient();
+  MockModemMessagingClient();
+  virtual ~MockModemMessagingClient();
 
   MOCK_METHOD3(SetSmsReceivedHandler, void(const std::string& service_name,
                                            const dbus::ObjectPath& object_path,
@@ -26,12 +28,8 @@ class MockGsmSMSClient : public GsmSMSClient {
                     const dbus::ObjectPath& object_path));
   MOCK_METHOD4(Delete, void(const std::string& service_name,
                             const dbus::ObjectPath& object_path,
-                            uint32 index,
+                            const dbus::ObjectPath& sms_path,
                             const DeleteCallback& callback));
-  MOCK_METHOD4(Get, void(const std::string& service_name,
-                         const dbus::ObjectPath& object_path,
-                         uint32 index,
-                         const GetCallback& callback));
   MOCK_METHOD3(List, void(const std::string& service_name,
                           const dbus::ObjectPath& object_path,
                           const ListCallback& callback));
@@ -41,4 +39,4 @@ class MockGsmSMSClient : public GsmSMSClient {
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_MOCK_GSM_SMS_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_MODEM_MESSAGING_CLIENT_H_