shill: Cellular mocks and tests: Switch pointer/ref spacing
Switch to Chrome style spacing.
BUG=chromium:501026
TEST=Unit tests
Change-Id: I2dd1ebe0afa6d6a6fb7d51d8b3968cd1839b64ac
Reviewed-on: https://chromium-review.googlesource.com/278071
Reviewed-by: Rebecca Silberstein <silberst@chromium.org>
Commit-Queue: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
diff --git a/cellular/active_passive_out_of_credits_detector_unittest.cc b/cellular/active_passive_out_of_credits_detector_unittest.cc
index 5a09e35..54e1f1c 100644
--- a/cellular/active_passive_out_of_credits_detector_unittest.cc
+++ b/cellular/active_passive_out_of_credits_detector_unittest.cc
@@ -90,11 +90,11 @@
out_of_credits_detector_->NotifyServiceStateChanged(old_state, new_state);
}
- void SetTrafficMonitor(TrafficMonitor *traffic_monitor) {
+ void SetTrafficMonitor(TrafficMonitor* traffic_monitor) {
out_of_credits_detector_->set_traffic_monitor(traffic_monitor);
}
- void SetConnectionHealthChecker(ConnectionHealthChecker *health_checker) {
+ void SetConnectionHealthChecker(ConnectionHealthChecker* health_checker) {
out_of_credits_detector_->set_connection_health_checker(health_checker);
}
@@ -231,7 +231,7 @@
}
TEST_F(ActivePassiveOutOfCreditsDetectorTest, StartTrafficMonitor) {
- MockTrafficMonitor *traffic_monitor = new StrictMock<MockTrafficMonitor>();
+ MockTrafficMonitor* traffic_monitor = new StrictMock<MockTrafficMonitor>();
SetTrafficMonitor(traffic_monitor); // Passes ownership.
// Traffic monitor should only start when the service is connected.
@@ -252,7 +252,7 @@
TEST_F(ActivePassiveOutOfCreditsDetectorTest, StopTrafficMonitor) {
// Traffic monitor should stop when the service is disconnected.
- MockTrafficMonitor *traffic_monitor = new StrictMock<MockTrafficMonitor>();
+ MockTrafficMonitor* traffic_monitor = new StrictMock<MockTrafficMonitor>();
SetTrafficMonitor(traffic_monitor); // Passes ownership.
EXPECT_CALL(*traffic_monitor, Start());
EXPECT_CALL(*traffic_monitor, Stop());
@@ -275,7 +275,7 @@
// Make sure the connection health checker starts when there is no network
// routing.
EXPECT_FALSE(out_of_credits_detector_->out_of_credits());
- MockConnectionHealthChecker *health_checker =
+ MockConnectionHealthChecker* health_checker =
new MockConnectionHealthChecker(
service_->connection(),
modem_info_.dispatcher(),
diff --git a/cellular/cellular_bearer_unittest.cc b/cellular/cellular_bearer_unittest.cc
index f21bfab..230d1b0 100644
--- a/cellular/cellular_bearer_unittest.cc
+++ b/cellular/cellular_bearer_unittest.cc
@@ -26,11 +26,11 @@
const char kIPv4Address[] = "10.0.0.1";
const char kIPv4Gateway[] = "10.0.0.254";
const int kIPv4SubnetPrefix = 8;
-const char *const kIPv4DNS[] = { "10.0.0.2", "8.8.4.4", "8.8.8.8" };
+const char* const kIPv4DNS[] = { "10.0.0.2", "8.8.4.4", "8.8.8.8" };
const char kIPv6Address[] = "0:0:0:0:0:ffff:a00:1";
const char kIPv6Gateway[] = "0:0:0:0:0:ffff:a00:fe";
const int kIPv6SubnetPrefix = 16;
-const char *const kIPv6DNS[] = {
+const char* const kIPv6DNS[] = {
"0:0:0:0:0:ffff:a00:fe", "0:0:0:0:0:ffff:808:404", "0:0:0:0:0:ffff:808:808"
};
@@ -85,7 +85,7 @@
}
static DBusPropertiesMap ConstructBearerProperties(
- bool connected, const string &data_interface,
+ bool connected, const string& data_interface,
MMBearerIpMethod ipv4_config_method,
MMBearerIpMethod ipv6_config_method) {
DBusPropertiesMap properties;
@@ -103,7 +103,7 @@
void VerifyStaticIPv4ConfigMethodAndProperties() {
EXPECT_EQ(IPConfig::kMethodStatic, bearer_.ipv4_config_method());
- const IPConfig::Properties *ipv4_config_properties =
+ const IPConfig::Properties* ipv4_config_properties =
bearer_.ipv4_config_properties();
ASSERT_NE(nullptr, ipv4_config_properties);;
EXPECT_EQ(IPAddress::kFamilyIPv4, ipv4_config_properties->address_family);
@@ -118,7 +118,7 @@
void VerifyStaticIPv6ConfigMethodAndProperties() {
EXPECT_EQ(IPConfig::kMethodStatic, bearer_.ipv6_config_method());
- const IPConfig::Properties *ipv6_config_properties =
+ const IPConfig::Properties* ipv6_config_properties =
bearer_.ipv6_config_properties();
ASSERT_NE(nullptr, ipv6_config_properties);;
EXPECT_EQ(IPAddress::kFamilyIPv6, ipv6_config_properties->address_family);
diff --git a/cellular/cellular_capability_cdma_unittest.cc b/cellular/cellular_capability_cdma_unittest.cc
index 3f8a8be..7aaffd2 100644
--- a/cellular/cellular_capability_cdma_unittest.cc
+++ b/cellular/cellular_capability_cdma_unittest.cc
@@ -58,44 +58,44 @@
virtual void SetUp() {
capability_ =
- dynamic_cast<CellularCapabilityCDMA *>(cellular_->capability_.get());
+ dynamic_cast<CellularCapabilityCDMA*>(cellular_->capability_.get());
}
- void InvokeActivate(const string &carrier, Error *error,
- const ActivationResultCallback &callback,
+ void InvokeActivate(const string& carrier, Error* error,
+ const ActivationResultCallback& callback,
int timeout) {
callback.Run(MM_MODEM_CDMA_ACTIVATION_ERROR_NO_ERROR, Error());
}
- void InvokeActivateError(const string &carrier, Error *error,
- const ActivationResultCallback &callback,
+ void InvokeActivateError(const string& carrier, Error* error,
+ const ActivationResultCallback& callback,
int timeout) {
callback.Run(MM_MODEM_CDMA_ACTIVATION_ERROR_NO_SIGNAL, Error());
}
- void InvokeDisconnect(Error *error,
- const ResultCallback &callback,
+ void InvokeDisconnect(Error* error,
+ const ResultCallback& callback,
int timeout) {
callback.Run(Error());
}
- void InvokeDisconnectError(Error *error,
- const ResultCallback &callback,
+ void InvokeDisconnectError(Error* error,
+ const ResultCallback& callback,
int timeout) {
Error err(Error::kOperationFailed);
callback.Run(err);
}
- void InvokeGetSignalQuality(Error *error,
- const SignalQualityCallback &callback,
+ void InvokeGetSignalQuality(Error* error,
+ const SignalQualityCallback& callback,
int timeout) {
callback.Run(kStrength, Error());
}
- void InvokeGetRegistrationState(Error *error,
- const RegistrationStateCallback &callback,
+ void InvokeGetRegistrationState(Error* error,
+ const RegistrationStateCallback& callback,
int timeout) {
callback.Run(MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED,
MM_MODEM_CDMA_REGISTRATION_STATE_HOME,
Error());
}
- MOCK_METHOD1(TestCallback, void(const Error &error));
+ MOCK_METHOD1(TestCallback, void(const Error& error));
protected:
static const char kMEID[];
@@ -133,7 +133,7 @@
scoped_refptr<MockCellular> cellular_;
std::unique_ptr<MockModemProxy> classic_proxy_;
std::unique_ptr<MockModemCDMAProxy> proxy_;
- CellularCapabilityCDMA *capability_; // Owned by |cellular_|.
+ CellularCapabilityCDMA* capability_; // Owned by |cellular_|.
};
const char CellularCapabilityCDMATest::kMEID[] = "D1234567EF8901";
diff --git a/cellular/cellular_capability_classic_unittest.cc b/cellular/cellular_capability_classic_unittest.cc
index ae2306f..f74f969 100644
--- a/cellular/cellular_capability_classic_unittest.cc
+++ b/cellular/cellular_capability_classic_unittest.cc
@@ -68,9 +68,9 @@
}
virtual void SetUp() {
- static_cast<Device *>(cellular_.get())->rtnl_handler_ = &rtnl_handler_;
+ static_cast<Device*>(cellular_.get())->rtnl_handler_ = &rtnl_handler_;
- capability_ = dynamic_cast<CellularCapabilityClassic *>(
+ capability_ = dynamic_cast<CellularCapabilityClassic*>(
cellular_->capability_.get());
device_adaptor_ =
dynamic_cast<DeviceMockAdaptor*>(cellular_->adaptor());
@@ -104,39 +104,39 @@
cellular_->service_ = service;
}
- CellularCapabilityGSM *GetGsmCapability() {
- return dynamic_cast<CellularCapabilityGSM *>(cellular_->capability_.get());
+ CellularCapabilityGSM* GetGsmCapability() {
+ return dynamic_cast<CellularCapabilityGSM*>(cellular_->capability_.get());
}
void ReleaseCapabilityProxies() {
capability_->ReleaseProxies();
}
- void InvokeEnable(bool enable, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeEnable(bool enable, Error* error,
+ const ResultCallback& callback, int timeout) {
callback.Run(Error());
}
- void InvokeEnableFail(bool enable, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeEnableFail(bool enable, Error* error,
+ const ResultCallback& callback, int timeout) {
callback.Run(Error(Error::kOperationFailed));
}
- void InvokeDisconnect(Error *error, const ResultCallback &callback,
+ void InvokeDisconnect(Error* error, const ResultCallback& callback,
int timeout) {
callback.Run(Error());
}
- void InvokeDisconnectFail(Error *error, const ResultCallback &callback,
+ void InvokeDisconnectFail(Error* error, const ResultCallback& callback,
int timeout) {
callback.Run(Error(Error::kOperationFailed));
}
- void InvokeGetModemStatus(Error *error,
- const DBusPropertyMapCallback &callback,
+ void InvokeGetModemStatus(Error* error,
+ const DBusPropertyMapCallback& callback,
int timeout) {
DBusPropertiesMap props;
props["carrier"].writer().append_string(kTestCarrier);
props["unknown-property"].writer().append_string("irrelevant-value");
callback.Run(props, Error());
}
- void InvokeGetModemInfo(Error *error, const ModemInfoCallback &callback,
+ void InvokeGetModemInfo(Error* error, const ModemInfoCallback& callback,
int timeout) {
ModemHardwareInfo info;
info._1 = kManufacturer;
@@ -144,12 +144,12 @@
info._3 = kHWRev;
callback.Run(info, Error());
}
- void InvokeSetCarrier(const string &carrier, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeSetCarrier(const string& carrier, Error* error,
+ const ResultCallback& callback, int timeout) {
callback.Run(Error());
}
- MOCK_METHOD1(TestCallback, void(const Error &error));
+ MOCK_METHOD1(TestCallback, void(const Error& error));
protected:
static const char kTestMobileProviderDBPath[];
@@ -160,29 +160,29 @@
class TestProxyFactory : public ProxyFactory {
public:
- explicit TestProxyFactory(CellularCapabilityTest *test) : test_(test) {}
+ explicit TestProxyFactory(CellularCapabilityTest* test) : test_(test) {}
- virtual ModemProxyInterface *CreateModemProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual ModemProxyInterface* CreateModemProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
return test_->proxy_.release();
}
- virtual ModemSimpleProxyInterface *CreateModemSimpleProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual ModemSimpleProxyInterface* CreateModemSimpleProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
return test_->simple_proxy_.release();
}
- virtual ModemCDMAProxyInterface *CreateModemCDMAProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual ModemCDMAProxyInterface* CreateModemCDMAProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
return test_->cdma_proxy_.release();
}
- virtual ModemGSMCardProxyInterface *CreateModemGSMCardProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual ModemGSMCardProxyInterface* CreateModemGSMCardProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
// TODO(benchan): This code conditionally returns a nullptr to avoid
// CellularCapabilityGSM::InitProperties (and thus
// CellularCapabilityGSM::GetIMSI) from being called during the
@@ -191,20 +191,20 @@
test_->gsm_card_proxy_.release() : nullptr;
}
- virtual ModemGSMNetworkProxyInterface *CreateModemGSMNetworkProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual ModemGSMNetworkProxyInterface* CreateModemGSMNetworkProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
return test_->gsm_network_proxy_.release();
}
- virtual ModemGobiProxyInterface *CreateModemGobiProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual ModemGobiProxyInterface* CreateModemGobiProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
return test_->gobi_proxy_.release();
}
private:
- CellularCapabilityTest *test_;
+ CellularCapabilityTest* test_;
};
void SetProxy() {
@@ -216,14 +216,14 @@
}
void SetGSMNetworkProxy() {
- CellularCapabilityGSM *gsm_capability =
- dynamic_cast<CellularCapabilityGSM *>(cellular_->capability_.get());
+ CellularCapabilityGSM* gsm_capability =
+ dynamic_cast<CellularCapabilityGSM*>(cellular_->capability_.get());
gsm_capability->network_proxy_.reset(gsm_network_proxy_.release());
}
void SetCellularType(Cellular::Type type) {
cellular_->InitCapability(type);
- capability_ = dynamic_cast<CellularCapabilityClassic *>(
+ capability_ = dynamic_cast<CellularCapabilityClassic*>(
cellular_->capability_.get());
}
@@ -242,8 +242,8 @@
std::unique_ptr<MockModemGSMNetworkProxy> gsm_network_proxy_;
std::unique_ptr<MockModemGobiProxy> gobi_proxy_;
TestProxyFactory proxy_factory_;
- CellularCapabilityClassic *capability_; // Owned by |cellular_|.
- DeviceMockAdaptor *device_adaptor_; // Owned by |cellular_|.
+ CellularCapabilityClassic* capability_; // Owned by |cellular_|.
+ DeviceMockAdaptor* device_adaptor_; // Owned by |cellular_|.
CellularRefPtr cellular_;
};
@@ -337,7 +337,7 @@
}
cellular_->state_ = Cellular::kStateConnected;
- dynamic_cast<CellularCapabilityGSM *>(capability_)->registration_state_ =
+ dynamic_cast<CellularCapabilityGSM*>(capability_)->registration_state_ =
MM_MODEM_GSM_NETWORK_REG_STATUS_ROAMING;
cellular_->SetAllowRoaming(true, nullptr);
EXPECT_TRUE(cellular_->GetAllowRoaming(nullptr));
@@ -401,7 +401,7 @@
Error error;
Stringmap apn_info;
DBusPropertiesMap props;
- CellularCapabilityGSM *gsm_capability = GetGsmCapability();
+ CellularCapabilityGSM* gsm_capability = GetGsmCapability();
apn_info[kApnProperty] = kLastGoodApn;
apn_info[kApnUsernameProperty] = kLastGoodUsername;
diff --git a/cellular/cellular_capability_gsm_unittest.cc b/cellular/cellular_capability_gsm_unittest.cc
index 7c57e0e..fa02272 100644
--- a/cellular/cellular_capability_gsm_unittest.cc
+++ b/cellular/cellular_capability_gsm_unittest.cc
@@ -76,95 +76,95 @@
virtual void SetUp() {
capability_ =
- dynamic_cast<CellularCapabilityGSM *>(cellular_->capability_.get());
+ dynamic_cast<CellularCapabilityGSM*>(cellular_->capability_.get());
device_adaptor_ =
- dynamic_cast<DeviceMockAdaptor *>(cellular_->adaptor());
+ dynamic_cast<DeviceMockAdaptor*>(cellular_->adaptor());
}
- void InvokeEnable(bool enable, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeEnable(bool enable, Error* error,
+ const ResultCallback& callback, int timeout) {
callback.Run(Error());
}
- void InvokeGetIMEI(Error *error, const GSMIdentifierCallback &callback,
+ void InvokeGetIMEI(Error* error, const GSMIdentifierCallback& callback,
int timeout) {
callback.Run(kIMEI, Error());
}
- void InvokeGetIMSI(Error *error, const GSMIdentifierCallback &callback,
+ void InvokeGetIMSI(Error* error, const GSMIdentifierCallback& callback,
int timeout) {
callback.Run(kIMSI, Error());
}
- void InvokeGetIMSIFails(Error *error, const GSMIdentifierCallback &callback,
+ void InvokeGetIMSIFails(Error* error, const GSMIdentifierCallback& callback,
int timeout) {
callback.Run("", Error(Error::kOperationFailed));
}
- void InvokeGetMSISDN(Error *error, const GSMIdentifierCallback &callback,
+ void InvokeGetMSISDN(Error* error, const GSMIdentifierCallback& callback,
int timeout) {
callback.Run(kMSISDN, Error());
}
- void InvokeGetMSISDNFail(Error *error, const GSMIdentifierCallback &callback,
+ void InvokeGetMSISDNFail(Error* error, const GSMIdentifierCallback& callback,
int timeout) {
callback.Run("", Error(Error::kOperationFailed));
}
- void InvokeGetSPN(Error *error, const GSMIdentifierCallback &callback,
+ void InvokeGetSPN(Error* error, const GSMIdentifierCallback& callback,
int timeout) {
callback.Run(kTestCarrier, Error());
}
- void InvokeGetSPNFail(Error *error, const GSMIdentifierCallback &callback,
+ void InvokeGetSPNFail(Error* error, const GSMIdentifierCallback& callback,
int timeout) {
callback.Run("", Error(Error::kOperationFailed));
}
- void InvokeGetSignalQuality(Error *error,
- const SignalQualityCallback &callback,
+ void InvokeGetSignalQuality(Error* error,
+ const SignalQualityCallback& callback,
int timeout) {
callback.Run(kStrength, Error());
}
- void InvokeGetRegistrationInfo(Error *error,
- const RegistrationInfoCallback &callback,
+ void InvokeGetRegistrationInfo(Error* error,
+ const RegistrationInfoCallback& callback,
int timeout) {
callback.Run(MM_MODEM_GSM_NETWORK_REG_STATUS_HOME,
kTestNetwork, kTestCarrier, Error());
}
- void InvokeRegister(const string &network_id,
- Error *error,
- const ResultCallback &callback,
+ void InvokeRegister(const string& network_id,
+ Error* error,
+ const ResultCallback& callback,
int timeout) {
callback.Run(Error());
}
- void InvokeEnablePIN(const string &pin, bool enable,
- Error *error, const ResultCallback &callback,
+ void InvokeEnablePIN(const string& pin, bool enable,
+ Error* error, const ResultCallback& callback,
int timeout) {
callback.Run(Error());
}
- void InvokeSendPIN(const string &pin, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeSendPIN(const string& pin, Error* error,
+ const ResultCallback& callback, int timeout) {
callback.Run(Error());
}
- void InvokeSendPUK(const string &puk, const string &pin, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeSendPUK(const string& puk, const string& pin, Error* error,
+ const ResultCallback& callback, int timeout) {
callback.Run(Error());
}
- void InvokeChangePIN(const string &old_pin, const string &pin, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeChangePIN(const string& old_pin, const string& pin, Error* error,
+ const ResultCallback& callback, int timeout) {
callback.Run(Error());
}
- void InvokeGetModemStatus(Error *error,
- const DBusPropertyMapCallback &callback,
+ void InvokeGetModemStatus(Error* error,
+ const DBusPropertyMapCallback& callback,
int timeout) {
DBusPropertiesMap props;
callback.Run(props, Error());
}
- void InvokeGetModemInfo(Error *error, const ModemInfoCallback &callback,
+ void InvokeGetModemInfo(Error* error, const ModemInfoCallback& callback,
int timeout) {
ModemHardwareInfo info;
callback.Run(info, Error());
}
- void InvokeConnectFail(DBusPropertiesMap props, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeConnectFail(DBusPropertiesMap props, Error* error,
+ const ResultCallback& callback, int timeout) {
callback.Run(Error(Error::kOperationFailed));
}
- MOCK_METHOD1(TestCallback, void(const Error &error));
+ MOCK_METHOD1(TestCallback, void(const Error& error));
protected:
static const char kAddress[];
@@ -180,23 +180,23 @@
class TestProxyFactory : public ProxyFactory {
public:
- explicit TestProxyFactory(CellularCapabilityGSMTest *test) : test_(test) {}
+ explicit TestProxyFactory(CellularCapabilityGSMTest* test) : test_(test) {}
- virtual ModemProxyInterface *CreateModemProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual ModemProxyInterface* CreateModemProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
return test_->proxy_.release();
}
- virtual ModemSimpleProxyInterface *CreateModemSimpleProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual ModemSimpleProxyInterface* CreateModemSimpleProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
return test_->simple_proxy_.release();
}
- virtual ModemGSMCardProxyInterface *CreateModemGSMCardProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual ModemGSMCardProxyInterface* CreateModemGSMCardProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
// TODO(benchan): This code conditionally returns a nullptr to avoid
// CellularCapabilityGSM::InitProperties (and thus
// CellularCapabilityGSM::GetIMSI) from being called during the
@@ -205,14 +205,14 @@
test_->card_proxy_.release() : nullptr;
}
- virtual ModemGSMNetworkProxyInterface *CreateModemGSMNetworkProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual ModemGSMNetworkProxyInterface* CreateModemGSMNetworkProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
return test_->network_proxy_.release();
}
private:
- CellularCapabilityGSMTest *test_;
+ CellularCapabilityGSMTest* test_;
};
void SetProxy() {
@@ -316,13 +316,13 @@
std::unique_ptr<MockModemGSMCardProxy> card_proxy_;
std::unique_ptr<MockModemGSMNetworkProxy> network_proxy_;
TestProxyFactory proxy_factory_;
- CellularCapabilityGSM *capability_; // Owned by |cellular_|.
- DeviceMockAdaptor *device_adaptor_; // Owned by |cellular_|.
+ CellularCapabilityGSM* capability_; // Owned by |cellular_|.
+ DeviceMockAdaptor* device_adaptor_; // Owned by |cellular_|.
CellularRefPtr cellular_;
// Set when required and passed to |cellular_|. Owned by |cellular_|.
- MockMobileOperatorInfo *mock_home_provider_info_;
- MockMobileOperatorInfo *mock_serving_operator_info_;
+ MockMobileOperatorInfo* mock_home_provider_info_;
+ MockMobileOperatorInfo* mock_serving_operator_info_;
};
const char CellularCapabilityGSMTest::kAddress[] = "1122334455";
@@ -569,7 +569,7 @@
static const char kID[] = "10001";
const string kLongName = "TestNetworkLongName";
// Replace the |MobileOperatorInfo| used by |ParseScanResult| by a mock.
- auto *mock_mobile_operator_info = new MockMobileOperatorInfo(
+ auto* mock_mobile_operator_info = new MockMobileOperatorInfo(
&dispatcher_,
"MockParseScanResult");
capability_->mobile_operator_info_.reset(mock_mobile_operator_info);
diff --git a/cellular/cellular_capability_universal_cdma_unittest.cc b/cellular/cellular_capability_universal_cdma_unittest.cc
index 02ae2db..348afe5 100644
--- a/cellular/cellular_capability_universal_cdma_unittest.cc
+++ b/cellular/cellular_capability_universal_cdma_unittest.cc
@@ -50,7 +50,7 @@
class CellularCapabilityUniversalCDMATest : public testing::Test {
public:
- explicit CellularCapabilityUniversalCDMATest(EventDispatcher *dispatcher)
+ explicit CellularCapabilityUniversalCDMATest(EventDispatcher* dispatcher)
: dispatcher_(dispatcher),
capability_(nullptr),
device_adaptor_(nullptr),
@@ -83,10 +83,10 @@
}
virtual void SetUp() {
- capability_ = dynamic_cast<CellularCapabilityUniversalCDMA *>(
+ capability_ = dynamic_cast<CellularCapabilityUniversalCDMA*>(
cellular_->capability_.get());
device_adaptor_ =
- dynamic_cast<NiceMock<DeviceMockAdaptor> *>(cellular_->adaptor());
+ dynamic_cast<NiceMock<DeviceMockAdaptor>*>(cellular_->adaptor());
cellular_->service_ = service_;
}
@@ -132,54 +132,54 @@
class TestProxyFactory : public ProxyFactory {
public:
- explicit TestProxyFactory(CellularCapabilityUniversalCDMATest *test) :
+ explicit TestProxyFactory(CellularCapabilityUniversalCDMATest* test) :
test_(test) {}
// TODO(armansito): Some of these methods won't be necessary after 3GPP
// gets refactored out of CellularCapabilityUniversal.
- virtual mm1::ModemModem3gppProxyInterface *CreateMM1ModemModem3gppProxy(
- const std::string &/*path*/,
- const std::string &/*service*/) {
+ virtual mm1::ModemModem3gppProxyInterface* CreateMM1ModemModem3gppProxy(
+ const std::string& /*path*/,
+ const std::string& /*service*/) {
return test_->modem_3gpp_proxy_.release();
}
- virtual mm1::ModemModemCdmaProxyInterface *CreateMM1ModemModemCdmaProxy(
- const std::string &/*path*/,
- const std::string &/*service*/) {
+ virtual mm1::ModemModemCdmaProxyInterface* CreateMM1ModemModemCdmaProxy(
+ const std::string& /*path*/,
+ const std::string& /*service*/) {
return test_->modem_cdma_proxy_.release();
}
- virtual mm1::ModemProxyInterface *CreateMM1ModemProxy(
- const std::string &/*path*/,
- const std::string &/*service*/) {
+ virtual mm1::ModemProxyInterface* CreateMM1ModemProxy(
+ const std::string& /*path*/,
+ const std::string& /*service*/) {
return test_->modem_proxy_.release();
}
- virtual mm1::ModemSimpleProxyInterface *CreateMM1ModemSimpleProxy(
- const std::string &/*path*/,
- const std::string &/*service*/) {
+ virtual mm1::ModemSimpleProxyInterface* CreateMM1ModemSimpleProxy(
+ const std::string& /*path*/,
+ const std::string& /*service*/) {
return test_->modem_simple_proxy_.release();
}
- virtual mm1::SimProxyInterface *CreateSimProxy(
- const std::string &/*path*/,
- const std::string &/*service*/) {
+ virtual mm1::SimProxyInterface* CreateSimProxy(
+ const std::string& /*path*/,
+ const std::string& /*service*/) {
return test_->sim_proxy_.release();
}
- virtual DBusPropertiesProxyInterface *CreateDBusPropertiesProxy(
- const std::string &/*path*/,
- const std::string &/*service*/) {
+ virtual DBusPropertiesProxyInterface* CreateDBusPropertiesProxy(
+ const std::string& /*path*/,
+ const std::string& /*service*/) {
return test_->properties_proxy_.release();
}
private:
- CellularCapabilityUniversalCDMATest *test_;
+ CellularCapabilityUniversalCDMATest* test_;
};
- EventDispatcher *dispatcher_;
- CellularCapabilityUniversalCDMA *capability_;
- NiceMock<DeviceMockAdaptor> *device_adaptor_;
+ EventDispatcher* dispatcher_;
+ CellularCapabilityUniversalCDMA* capability_;
+ NiceMock<DeviceMockAdaptor>* device_adaptor_;
MockModemInfo modem_info_;
MockGLib glib_;
// TODO(armansito): Remove |modem_3gpp_proxy_| after refactor.
@@ -191,11 +191,11 @@
unique_ptr<MockDBusPropertiesProxy> properties_proxy_;
TestProxyFactory proxy_factory_;
CellularRefPtr cellular_;
- MockCellularService *service_;
+ MockCellularService* service_;
// Set when required and passed to |cellular_|. Owned by |cellular_|.
- MockMobileOperatorInfo *mock_home_provider_info_;
- MockMobileOperatorInfo *mock_serving_operator_info_;
+ MockMobileOperatorInfo* mock_home_provider_info_;
+ MockMobileOperatorInfo* mock_serving_operator_info_;
};
// static
@@ -332,7 +332,7 @@
const string activation_code {"1234"};
SetMockMobileOperatorInfoObjects();
- mm1::MockModemModemCdmaProxy *cdma_proxy = modem_cdma_proxy_.get();
+ mm1::MockModemModemCdmaProxy* cdma_proxy = modem_cdma_proxy_.get();
SetUp();
capability_->InitProxies();
diff --git a/cellular/cellular_capability_universal_unittest.cc b/cellular/cellular_capability_universal_unittest.cc
index 4566799..ab2dd60 100644
--- a/cellular/cellular_capability_universal_unittest.cc
+++ b/cellular/cellular_capability_universal_unittest.cc
@@ -66,7 +66,7 @@
class CellularCapabilityUniversalTest : public testing::TestWithParam<string> {
public:
- explicit CellularCapabilityUniversalTest(EventDispatcher *dispatcher)
+ explicit CellularCapabilityUniversalTest(EventDispatcher* dispatcher)
: dispatcher_(dispatcher),
modem_info_(nullptr, dispatcher, nullptr, nullptr, nullptr),
modem_3gpp_proxy_(new mm1::MockModemModem3gppProxy()),
@@ -101,10 +101,10 @@
}
virtual void SetUp() {
- capability_ = dynamic_cast<CellularCapabilityUniversal *>(
+ capability_ = dynamic_cast<CellularCapabilityUniversal*>(
cellular_->capability_.get());
device_adaptor_ =
- dynamic_cast<DeviceMockAdaptor *>(cellular_->adaptor());
+ dynamic_cast<DeviceMockAdaptor*>(cellular_->adaptor());
cellular_->service_ = service_;
// kStateUnknown leads to minimal extra work in maintaining
@@ -178,25 +178,25 @@
.WillOnce(Return(modem3gpp_properties));
}
- void InvokeEnable(bool enable, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeEnable(bool enable, Error* error,
+ const ResultCallback& callback, int timeout) {
callback.Run(Error());
}
- void InvokeEnableFail(bool enable, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeEnableFail(bool enable, Error* error,
+ const ResultCallback& callback, int timeout) {
callback.Run(Error(Error::kOperationFailed));
}
- void InvokeEnableInWrongState(bool enable, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeEnableInWrongState(bool enable, Error* error,
+ const ResultCallback& callback, int timeout) {
callback.Run(Error(Error::kWrongState));
}
- void InvokeRegister(const string &operator_id, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeRegister(const string& operator_id, Error* error,
+ const ResultCallback& callback, int timeout) {
callback.Run(Error());
}
- void InvokeSetPowerState(const uint32_t &power_state,
- Error *error,
- const ResultCallback &callback,
+ void InvokeSetPowerState(const uint32_t& power_state,
+ Error* error,
+ const ResultCallback& callback,
int timeout) {
callback.Run(Error());
}
@@ -228,7 +228,7 @@
timeout_milliseconds;
}
- MOCK_METHOD1(TestCallback, void(const Error &error));
+ MOCK_METHOD1(TestCallback, void(const Error& error));
MOCK_METHOD0(DummyCallback, void(void));
@@ -248,7 +248,7 @@
class TestProxyFactory : public ProxyFactory {
public:
- explicit TestProxyFactory(CellularCapabilityUniversalTest *test) :
+ explicit TestProxyFactory(CellularCapabilityUniversalTest* test) :
test_(test) {
active_bearer_properties_[MM_BEARER_PROPERTY_CONNECTED].writer()
.append_bool(true);
@@ -265,50 +265,50 @@
.append_bool(false);
}
- DBusPropertiesMap *mutable_active_bearer_properties() {
+ DBusPropertiesMap* mutable_active_bearer_properties() {
return &active_bearer_properties_;
}
- DBusPropertiesMap *mutable_inactive_bearer_properties() {
+ DBusPropertiesMap* mutable_inactive_bearer_properties() {
return &inactive_bearer_properties_;
}
- virtual mm1::ModemModem3gppProxyInterface *CreateMM1ModemModem3gppProxy(
- const std::string &/*path*/,
- const std::string &/*service*/) {
+ virtual mm1::ModemModem3gppProxyInterface* CreateMM1ModemModem3gppProxy(
+ const std::string& /*path*/,
+ const std::string& /*service*/) {
return test_->modem_3gpp_proxy_.release();
}
- virtual mm1::ModemModemCdmaProxyInterface *CreateMM1ModemModemCdmaProxy(
- const std::string &/*path*/,
- const std::string &/*service*/) {
+ virtual mm1::ModemModemCdmaProxyInterface* CreateMM1ModemModemCdmaProxy(
+ const std::string& /*path*/,
+ const std::string& /*service*/) {
return test_->modem_cdma_proxy_.release();
}
- virtual mm1::ModemProxyInterface *CreateMM1ModemProxy(
- const std::string &/*path*/,
- const std::string &/*service*/) {
+ virtual mm1::ModemProxyInterface* CreateMM1ModemProxy(
+ const std::string& /*path*/,
+ const std::string& /*service*/) {
return test_->modem_proxy_.release();
}
- virtual mm1::ModemSimpleProxyInterface *CreateMM1ModemSimpleProxy(
- const std::string &/*path*/,
- const std::string &/*service*/) {
+ virtual mm1::ModemSimpleProxyInterface* CreateMM1ModemSimpleProxy(
+ const std::string& /*path*/,
+ const std::string& /*service*/) {
return test_->modem_simple_proxy_.release();
}
- virtual mm1::SimProxyInterface *CreateSimProxy(
- const std::string &/*path*/,
- const std::string &/*service*/) {
- mm1::MockSimProxy *sim_proxy = test_->sim_proxy_.release();
+ virtual mm1::SimProxyInterface* CreateSimProxy(
+ const std::string& /*path*/,
+ const std::string& /*service*/) {
+ mm1::MockSimProxy* sim_proxy = test_->sim_proxy_.release();
test_->sim_proxy_.reset(new mm1::MockSimProxy());
return sim_proxy;
}
- virtual DBusPropertiesProxyInterface *CreateDBusPropertiesProxy(
- const std::string &path,
- const std::string &/*service*/) {
- MockDBusPropertiesProxy *properties_proxy =
+ virtual DBusPropertiesProxyInterface* CreateDBusPropertiesProxy(
+ const std::string& path,
+ const std::string& /*service*/) {
+ MockDBusPropertiesProxy* properties_proxy =
test_->properties_proxy_.release();
if (path.find(kActiveBearerPathPrefix) != std::string::npos) {
EXPECT_CALL(*properties_proxy, GetAll(MM_DBUS_INTERFACE_BEARER))
@@ -324,12 +324,12 @@
}
private:
- CellularCapabilityUniversalTest *test_;
+ CellularCapabilityUniversalTest* test_;
DBusPropertiesMap active_bearer_properties_;
DBusPropertiesMap inactive_bearer_properties_;
};
- EventDispatcher *dispatcher_;
+ EventDispatcher* dispatcher_;
MockModemInfo modem_info_;
unique_ptr<mm1::MockModemModem3gppProxy> modem_3gpp_proxy_;
unique_ptr<mm1::MockModemModemCdmaProxy> modem_cdma_proxy_;
@@ -338,15 +338,15 @@
unique_ptr<mm1::MockSimProxy> sim_proxy_;
unique_ptr<MockDBusPropertiesProxy> properties_proxy_;
TestProxyFactory proxy_factory_;
- CellularCapabilityUniversal *capability_; // Owned by |cellular_|.
- DeviceMockAdaptor *device_adaptor_; // Owned by |cellular_|.
+ CellularCapabilityUniversal* capability_; // Owned by |cellular_|.
+ DeviceMockAdaptor* device_adaptor_; // Owned by |cellular_|.
CellularRefPtr cellular_;
- MockCellularService *service_; // owned by cellular_
+ MockCellularService* service_; // owned by cellular_
DBusPathCallback connect_callback_; // saved for testing connect operations
// Set when required and passed to |cellular_|. Owned by |cellular_|.
- MockMobileOperatorInfo *mock_home_provider_info_;
- MockMobileOperatorInfo *mock_serving_operator_info_;
+ MockMobileOperatorInfo* mock_home_provider_info_;
+ MockMobileOperatorInfo* mock_serving_operator_info_;
};
// Most of our tests involve using a real EventDispatcher object.
@@ -492,7 +492,7 @@
TEST_F(CellularCapabilityUniversalMainTest, StopModem) {
// Save pointers to proxies before they are lost by the call to InitProxies
- mm1::MockModemProxy *modem_proxy = modem_proxy_.get();
+ mm1::MockModemProxy* modem_proxy = modem_proxy_.get();
EXPECT_CALL(*modem_proxy, set_state_changed_callback(_));
capability_->InitProxies();
@@ -529,7 +529,7 @@
TEST_F(CellularCapabilityUniversalMainTest, StopModemAltair) {
// Save pointers to proxies before they are lost by the call to InitProxies
- mm1::MockModemProxy *modem_proxy = modem_proxy_.get();
+ mm1::MockModemProxy* modem_proxy = modem_proxy_.get();
EXPECT_CALL(*modem_proxy, set_state_changed_callback(_));
capability_->InitProxies();
@@ -576,7 +576,7 @@
TEST_F(CellularCapabilityUniversalMainTest,
StopModemAltairDeleteBearerFailure) {
// Save pointers to proxies before they are lost by the call to InitProxies
- mm1::MockModemProxy *modem_proxy = modem_proxy_.get();
+ mm1::MockModemProxy* modem_proxy = modem_proxy_.get();
EXPECT_CALL(*modem_proxy, set_state_changed_callback(_));
capability_->InitProxies();
@@ -622,7 +622,7 @@
TEST_F(CellularCapabilityUniversalMainTest, StopModemAltairNotConnected) {
// Save pointers to proxies before they are lost by the call to InitProxies
- mm1::MockModemProxy *modem_proxy = modem_proxy_.get();
+ mm1::MockModemProxy* modem_proxy = modem_proxy_.get();
EXPECT_CALL(*modem_proxy, set_state_changed_callback(_));
capability_->InitProxies();
capability_->set_active_bearer(nullptr);
@@ -959,7 +959,7 @@
cellular_->set_modem_state(Cellular::kModemStateConnected);
SetRegistrationDroppedUpdateTimeout(0);
- const Stringmap &home_provider_map = cellular_->home_provider();
+ const Stringmap& home_provider_map = cellular_->home_provider();
ASSERT_NE(home_provider_map.end(), home_provider_map.find(kOperatorNameKey));
string home_provider = home_provider_map.find(kOperatorNameKey)->second;
string ota_name = cellular_->service_->friendly_name();
@@ -1114,7 +1114,7 @@
cellular_->set_modem_state(Cellular::kModemStateRegistered);
SetRegistrationDroppedUpdateTimeout(0);
- const Stringmap &home_provider_map = cellular_->home_provider();
+ const Stringmap& home_provider_map = cellular_->home_provider();
ASSERT_NE(home_provider_map.end(), home_provider_map.find(kOperatorNameKey));
string home_provider = home_provider_map.find(kOperatorNameKey)->second;
string ota_name = cellular_->service_->friendly_name();
@@ -1297,7 +1297,7 @@
TEST_F(CellularCapabilityUniversalMainTest, Reset) {
// Save pointers to proxies before they are lost by the call to InitProxies
- mm1::MockModemProxy *modem_proxy = modem_proxy_.get();
+ mm1::MockModemProxy* modem_proxy = modem_proxy_.get();
EXPECT_CALL(*modem_proxy, set_state_changed_callback(_));
capability_->InitProxies();
@@ -1360,7 +1360,7 @@
// Validates expected behavior of Connect function
TEST_F(CellularCapabilityUniversalMainTest, Connect) {
- mm1::MockModemSimpleProxy *modem_simple_proxy = modem_simple_proxy_.get();
+ mm1::MockModemSimpleProxy* modem_simple_proxy = modem_simple_proxy_.get();
SetSimpleProxy();
Error error;
DBusPropertiesMap properties;
@@ -1400,7 +1400,7 @@
// Validates Connect iterates over APNs
TEST_F(CellularCapabilityUniversalMainTest, ConnectApns) {
- mm1::MockModemSimpleProxy *modem_simple_proxy = modem_simple_proxy_.get();
+ mm1::MockModemSimpleProxy* modem_simple_proxy = modem_simple_proxy_.get();
SetSimpleProxy();
Error error;
DBusPropertiesMap properties;
diff --git a/cellular/cellular_service_unittest.cc b/cellular/cellular_service_unittest.cc
index f4acb43..8e4ec1c 100644
--- a/cellular/cellular_service_unittest.cc
+++ b/cellular/cellular_service_unittest.cc
@@ -54,15 +54,15 @@
virtual void SetUp() {
adaptor_ =
- dynamic_cast<ServiceMockAdaptor *>(service_->adaptor());
+ dynamic_cast<ServiceMockAdaptor*>(service_->adaptor());
out_of_credits_detector_ =
new MockOutOfCreditsDetector(nullptr, nullptr, nullptr, service_.get());
// Passes ownership.
service_->set_out_of_credits_detector(out_of_credits_detector_);
}
- CellularCapabilityCDMA *GetCapabilityCDMA() {
- return dynamic_cast<CellularCapabilityCDMA *>(device_->capability_.get());
+ CellularCapabilityCDMA* GetCapabilityCDMA() {
+ return dynamic_cast<CellularCapabilityCDMA*>(device_->capability_.get());
}
protected:
@@ -74,8 +74,8 @@
MockModemInfo modem_info_;
scoped_refptr<MockCellular> device_;
CellularServiceRefPtr service_;
- ServiceMockAdaptor *adaptor_; // Owned by |service_|.
- MockOutOfCreditsDetector *out_of_credits_detector_; // Owned by |service_|.
+ ServiceMockAdaptor* adaptor_; // Owned by |service_|.
+ MockOutOfCreditsDetector* out_of_credits_detector_; // Owned by |service_|.
};
const char CellularServiceTest::kAddress[] = "000102030405";
@@ -172,7 +172,7 @@
EXPECT_CALL(*adaptor_,
EmitStringmapChanged(kServingOperatorProperty, _));
service_->set_serving_operator(test_operator);
- const Stringmap &serving_operator = service_->serving_operator();
+ const Stringmap& serving_operator = service_->serving_operator();
ASSERT_NE(serving_operator.end(), serving_operator.find(kOperatorCodeKey));
ASSERT_NE(serving_operator.end(), serving_operator.find(kOperatorNameKey));
EXPECT_EQ(kCode, serving_operator.find(kOperatorCodeKey)->second);
@@ -296,7 +296,7 @@
EXPECT_CALL(*adaptor_,
EmitStringmapChanged(kCellularLastGoodApnProperty, _));
service_->SetLastGoodApn(testapn);
- Stringmap *resultapn = service_->GetLastGoodApn();
+ Stringmap* resultapn = service_->GetLastGoodApn();
EXPECT_NE(nullptr, resultapn);
EXPECT_EQ(2, resultapn->size());
Stringmap::const_iterator it = resultapn->find(kApnProperty);
@@ -322,7 +322,7 @@
}
TEST_F(CellularServiceTest, IsAutoConnectable) {
- const char *reason = nullptr;
+ const char* reason = nullptr;
ON_CALL(*out_of_credits_detector_, IsDetecting())
.WillByDefault(Return(false));
diff --git a/cellular/cellular_unittest.cc b/cellular/cellular_unittest.cc
index 8fc4e9b..48bf396 100644
--- a/cellular/cellular_unittest.cc
+++ b/cellular/cellular_unittest.cc
@@ -162,7 +162,7 @@
}
virtual void SetUp() {
- static_cast<Device *>(device_.get())->rtnl_handler_ = &rtnl_handler_;
+ static_cast<Device*>(device_.get())->rtnl_handler_ = &rtnl_handler_;
device_->set_dhcp_provider(&dhcp_provider_);
EXPECT_CALL(*modem_info_.mock_manager(), device_info())
.WillRepeatedly(Return(&device_info_));
@@ -204,28 +204,28 @@
device_->set_serving_operator_info(mock_serving_operator_info_);
}
- void InvokeEnable(bool enable, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeEnable(bool enable, Error* error,
+ const ResultCallback& callback, int timeout) {
callback.Run(Error());
}
void InvokeEnableReturningWrongState(
- bool enable, Error *error, const ResultCallback &callback, int timeout) {
+ bool enable, Error* error, const ResultCallback& callback, int timeout) {
callback.Run(Error(Error::kWrongState));
}
- void InvokeGetSignalQuality(Error *error,
- const SignalQualityCallback &callback,
+ void InvokeGetSignalQuality(Error* error,
+ const SignalQualityCallback& callback,
int timeout) {
callback.Run(kStrength, Error());
}
- void InvokeGetModemStatus(Error *error,
- const DBusPropertyMapCallback &callback,
+ void InvokeGetModemStatus(Error* error,
+ const DBusPropertyMapCallback& callback,
int timeout) {
DBusPropertiesMap props;
props["carrier"].writer().append_string(kTestCarrier);
props["unknown-property"].writer().append_string("irrelevant-value");
callback.Run(props, Error());
}
- void InvokeGetModemInfo(Error *error, const ModemInfoCallback &callback,
+ void InvokeGetModemInfo(Error* error, const ModemInfoCallback& callback,
int timeout) {
static const char kManufacturer[] = "Company";
static const char kModelID[] = "Gobi 2000";
@@ -236,97 +236,97 @@
info._3 = kHWRev;
callback.Run(info, Error());
}
- void InvokeGetRegistrationState1X(Error *error,
- const RegistrationStateCallback &callback,
+ void InvokeGetRegistrationState1X(Error* error,
+ const RegistrationStateCallback& callback,
int timeout) {
callback.Run(MM_MODEM_CDMA_REGISTRATION_STATE_HOME,
MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN,
Error());
}
- void InvokeGetIMEI(Error *error, const GSMIdentifierCallback &callback,
+ void InvokeGetIMEI(Error* error, const GSMIdentifierCallback& callback,
int timeout) {
callback.Run(kIMEI, Error());
}
- void InvokeGetIMSI(Error *error, const GSMIdentifierCallback &callback,
+ void InvokeGetIMSI(Error* error, const GSMIdentifierCallback& callback,
int timeout) {
callback.Run(kIMSI, Error());
}
- void InvokeGetMSISDN(Error *error, const GSMIdentifierCallback &callback,
+ void InvokeGetMSISDN(Error* error, const GSMIdentifierCallback& callback,
int timeout) {
callback.Run(kMSISDN, Error());
}
- void InvokeGetSPN(Error *error, const GSMIdentifierCallback &callback,
+ void InvokeGetSPN(Error* error, const GSMIdentifierCallback& callback,
int timeout) {
callback.Run(kTestCarrierSPN, Error());
}
- void InvokeGetRegistrationInfo(Error *error,
- const RegistrationInfoCallback &callback,
+ void InvokeGetRegistrationInfo(Error* error,
+ const RegistrationInfoCallback& callback,
int timeout) {
static const char kNetworkID[] = "22803";
callback.Run(MM_MODEM_GSM_NETWORK_REG_STATUS_ROAMING,
kNetworkID, kTestCarrier, Error());
}
- void InvokeRegister(const string &network_id,
- Error *error,
- const ResultCallback &callback,
+ void InvokeRegister(const string& network_id,
+ Error* error,
+ const ResultCallback& callback,
int timeout) {
callback.Run(Error());
}
- void InvokeGetRegistrationState(Error *error,
- const RegistrationStateCallback &callback,
+ void InvokeGetRegistrationState(Error* error,
+ const RegistrationStateCallback& callback,
int timeout) {
callback.Run(MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED,
MM_MODEM_CDMA_REGISTRATION_STATE_HOME,
Error());
}
void InvokeGetRegistrationStateUnregistered(
- Error *error,
- const RegistrationStateCallback &callback,
+ Error* error,
+ const RegistrationStateCallback& callback,
int timeout) {
callback.Run(MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN,
MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN,
Error());
}
- void InvokeConnect(DBusPropertiesMap props, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeConnect(DBusPropertiesMap props, Error* error,
+ const ResultCallback& callback, int timeout) {
EXPECT_EQ(Service::kStateAssociating, device_->service_->state());
callback.Run(Error());
}
- void InvokeConnectFail(DBusPropertiesMap props, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeConnectFail(DBusPropertiesMap props, Error* error,
+ const ResultCallback& callback, int timeout) {
EXPECT_EQ(Service::kStateAssociating, device_->service_->state());
callback.Run(Error(Error::kNotOnHomeNetwork));
}
- void InvokeConnectFailNoService(DBusPropertiesMap props, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeConnectFailNoService(DBusPropertiesMap props, Error* error,
+ const ResultCallback& callback, int timeout) {
device_->service_ = nullptr;
callback.Run(Error(Error::kNotOnHomeNetwork));
}
- void InvokeConnectSuccessNoService(DBusPropertiesMap props, Error *error,
- const ResultCallback &callback,
+ void InvokeConnectSuccessNoService(DBusPropertiesMap props, Error* error,
+ const ResultCallback& callback,
int timeout) {
device_->service_ = nullptr;
callback.Run(Error());
}
- void InvokeDisconnect(Error *error, const ResultCallback &callback,
+ void InvokeDisconnect(Error* error, const ResultCallback& callback,
int timeout) {
if (!callback.is_null())
callback.Run(Error());
}
- void InvokeDisconnectFail(Error *error, const ResultCallback &callback,
+ void InvokeDisconnectFail(Error* error, const ResultCallback& callback,
int timeout) {
error->Populate(Error::kOperationFailed);
if (!callback.is_null())
callback.Run(*error);
}
- void InvokeDisconnectMM1(const ::DBus::Path &bearer, Error *error,
- const ResultCallback &callback, int timeout) {
+ void InvokeDisconnectMM1(const ::DBus::Path& bearer, Error* error,
+ const ResultCallback& callback, int timeout) {
if (!callback.is_null())
callback.Run(Error());
}
- void InvokeSetPowerState(const uint32_t &power_state,
- Error *error,
- const ResultCallback &callback,
+ void InvokeSetPowerState(const uint32_t& power_state,
+ Error* error,
+ const ResultCallback& callback,
int timeout) {
callback.Run(Error());
}
@@ -368,7 +368,7 @@
}
void StartPPP(int pid) {
- MockGLib &mock_glib(*dynamic_cast<MockGLib *>(modem_info_.glib()));
+ MockGLib& mock_glib(*dynamic_cast<MockGLib*>(modem_info_.glib()));
EXPECT_CALL(mock_glib, ChildWatchAdd(pid, _, _));
EXPECT_CALL(mock_glib, SpawnAsync(_, _, _, _, _, _, _, _))
.WillOnce(DoAll(SetArgumentPointee<6>(pid), Return(true)));
@@ -392,7 +392,7 @@
void ExpectPPPStopped() {
auto mock_ppp_device =
- dynamic_cast<MockPPPDevice *>(device_->ppp_device_.get());
+ dynamic_cast<MockPPPDevice*>(device_->ppp_device_.get());
EXPECT_CALL(*mock_ppp_device, DropConnection());
}
@@ -409,20 +409,20 @@
.Times(AnyNumber());
EXPECT_CALL(*modem_info_.mock_manager(), UpdateEnabledTechnologies())
.Times(AnyNumber());
- EXPECT_CALL(*dynamic_cast<DeviceMockAdaptor *>(device_->adaptor()),
+ EXPECT_CALL(*dynamic_cast<DeviceMockAdaptor*>(device_->adaptor()),
EmitBoolChanged(_, _)).Times(AnyNumber());
}
- mm1::MockModemProxy *SetupOnAfterResume() {
+ mm1::MockModemProxy* SetupOnAfterResume() {
SetCellularType(Cellular::kTypeUniversal);
SetCommonOnAfterResumeExpectations();
return mm1_proxy_.get(); // Before the capability snags it.
}
- void VerifyOperatorMap(const Stringmap &operator_map,
- const string &code,
- const string &name,
- const string &country) {
+ void VerifyOperatorMap(const Stringmap& operator_map,
+ const string& code,
+ const string& name,
+ const string& country) {
Stringmap::const_iterator it;
Stringmap::const_iterator endit = operator_map.end();
@@ -449,7 +449,7 @@
}
}
- MOCK_METHOD1(TestCallback, void(const Error &error));
+ MOCK_METHOD1(TestCallback, void(const Error& error));
protected:
static const char kTestDeviceName[];
@@ -478,39 +478,39 @@
class TestProxyFactory : public ProxyFactory {
public:
- explicit TestProxyFactory(CellularTest *test) : test_(test) {}
+ explicit TestProxyFactory(CellularTest* test) : test_(test) {}
- virtual DBusPropertiesProxyInterface *CreateDBusPropertiesProxy(
- const std::string &path,
- const std::string &service) {
+ virtual DBusPropertiesProxyInterface* CreateDBusPropertiesProxy(
+ const std::string& path,
+ const std::string& service) {
CHECK(test_->dbus_properties_proxy_);
return test_->dbus_properties_proxy_.release();
}
- virtual ModemProxyInterface *CreateModemProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual ModemProxyInterface* CreateModemProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
CHECK(test_->proxy_);
return test_->proxy_.release();
}
- virtual ModemSimpleProxyInterface *CreateModemSimpleProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual ModemSimpleProxyInterface* CreateModemSimpleProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
CHECK(test_->simple_proxy_);
return test_->simple_proxy_.release();
}
- virtual ModemCDMAProxyInterface *CreateModemCDMAProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual ModemCDMAProxyInterface* CreateModemCDMAProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
CHECK(test_->cdma_proxy_);
return test_->cdma_proxy_.release();
}
- virtual ModemGSMCardProxyInterface *CreateModemGSMCardProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual ModemGSMCardProxyInterface* CreateModemGSMCardProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
// TODO(benchan): This code conditionally returns a nullptr to avoid
// CellularCapabilityGSM::InitProperties (and thus
// CellularCapabilityGSM::GetIMSI) from being called during the
@@ -521,36 +521,36 @@
test_->gsm_card_proxy_.release() : nullptr;
}
- virtual ModemGSMNetworkProxyInterface *CreateModemGSMNetworkProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual ModemGSMNetworkProxyInterface* CreateModemGSMNetworkProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
CHECK(test_->gsm_network_proxy_);
return test_->gsm_network_proxy_.release();
}
- virtual mm1::ModemModem3gppProxyInterface *CreateMM1ModemModem3gppProxy(
- const std::string &path,
- const std::string &service) {
+ virtual mm1::ModemModem3gppProxyInterface* CreateMM1ModemModem3gppProxy(
+ const std::string& path,
+ const std::string& service) {
CHECK(test_->mm1_modem_3gpp_proxy_);
return test_->mm1_modem_3gpp_proxy_.release();
}
- virtual mm1::ModemProxyInterface *CreateMM1ModemProxy(
- const std::string &path,
- const std::string &service) {
+ virtual mm1::ModemProxyInterface* CreateMM1ModemProxy(
+ const std::string& path,
+ const std::string& service) {
CHECK(test_->mm1_proxy_);
return test_->mm1_proxy_.release();
}
- virtual mm1::ModemSimpleProxyInterface *CreateMM1ModemSimpleProxy(
- const string &/*path*/,
- const string &/*service*/) {
+ virtual mm1::ModemSimpleProxyInterface* CreateMM1ModemSimpleProxy(
+ const string& /*path*/,
+ const string& /*service*/) {
CHECK(test_->mm1_simple_proxy_);
return test_->mm1_simple_proxy_.release();
}
private:
- CellularTest *test_;
+ CellularTest* test_;
};
void StartRTNLHandler();
void StopRTNLHandler();
@@ -563,33 +563,33 @@
device_->InitCapability(type);
}
- CellularCapabilityClassic *GetCapabilityClassic() {
- return dynamic_cast<CellularCapabilityClassic *>(
+ CellularCapabilityClassic* GetCapabilityClassic() {
+ return dynamic_cast<CellularCapabilityClassic*>(
device_->capability_.get());
}
- CellularCapabilityCDMA *GetCapabilityCDMA() {
- return dynamic_cast<CellularCapabilityCDMA *>(device_->capability_.get());
+ CellularCapabilityCDMA* GetCapabilityCDMA() {
+ return dynamic_cast<CellularCapabilityCDMA*>(device_->capability_.get());
}
- CellularCapabilityGSM *GetCapabilityGSM() {
- return dynamic_cast<CellularCapabilityGSM *>(device_->capability_.get());
+ CellularCapabilityGSM* GetCapabilityGSM() {
+ return dynamic_cast<CellularCapabilityGSM*>(device_->capability_.get());
}
- CellularCapabilityUniversal *GetCapabilityUniversal() {
- return dynamic_cast<CellularCapabilityUniversal *>(
+ CellularCapabilityUniversal* GetCapabilityUniversal() {
+ return dynamic_cast<CellularCapabilityUniversal*>(
device_->capability_.get());
}
// Different tests simulate a cellular service being set using a real /mock
// service.
- CellularService *SetService() {
+ CellularService* SetService() {
device_->service_ = new CellularService(&modem_info_, device_);
return device_->service_.get();
}
- MockCellularService *SetMockService() {
+ MockCellularService* SetMockService() {
device_->service_ = new MockCellularService(&modem_info_, device_);
- return static_cast<MockCellularService *>(device_->service_.get());
+ return static_cast<MockCellularService*>(device_->service_.get());
}
void set_enabled_persistent(bool new_value) {
@@ -598,7 +598,7 @@
void SetCapabilityUniversalActiveBearer(unique_ptr<CellularBearer> bearer) {
SetCellularType(Cellular::kTypeUniversal);
- CellularCapabilityUniversal *capability = GetCapabilityUniversal();
+ CellularCapabilityUniversal* capability = GetCapabilityUniversal();
capability->active_bearer_ = std::move(bearer);
}
@@ -621,8 +621,8 @@
unique_ptr<mm1::MockModemProxy> mm1_proxy_;
unique_ptr<mm1::MockModemSimpleProxy> mm1_simple_proxy_;
TestProxyFactory proxy_factory_;
- MockMobileOperatorInfo *mock_home_provider_info_;
- MockMobileOperatorInfo *mock_serving_operator_info_;
+ MockMobileOperatorInfo* mock_home_provider_info_;
+ MockMobileOperatorInfo* mock_serving_operator_info_;
CellularRefPtr device_;
};
@@ -1287,7 +1287,7 @@
// If the network interface goes down, Cellular::LinkEvent should
// drop the connection but the service object should persist.
device_->state_ = Cellular::kStateLinked;
- CellularService *service = SetService();
+ CellularService* service = SetService();
device_->LinkEvent(0, 0); // flags doesn't contain IFF_UP
EXPECT_EQ(device_->state_, Cellular::kStateConnected);
EXPECT_EQ(device_->service_, service);
@@ -1376,7 +1376,7 @@
TEST_F(CellularTest, ModemStateChangeLostRegistration) {
SetCellularType(Cellular::kTypeUniversal);
- CellularCapabilityUniversal *capability = GetCapabilityUniversal();
+ CellularCapabilityUniversal* capability = GetCapabilityUniversal();
capability->registration_state_ = MM_MODEM_3GPP_REGISTRATION_STATE_HOME;
EXPECT_TRUE(capability->IsRegistered());
device_->set_modem_state(Cellular::kModemStateRegistered);
@@ -1435,9 +1435,9 @@
public RPCTaskDelegate,
public base::SupportsWeakPtr<TestRPCTaskDelegate> {
public:
- virtual void GetLogin(std::string *user, std::string *password) {}
- virtual void Notify(const std::string &reason,
- const std::map<std::string, std::string> &dict) {}
+ virtual void GetLogin(std::string* user, std::string* password) {}
+ virtual void Notify(const std::string& reason,
+ const std::map<std::string, std::string>& dict) {}
};
TEST_F(CellularTest, LinkEventUpWithPPP) {
@@ -1483,7 +1483,7 @@
}
TEST_F(CellularTest, StartPPPAfterEthernetUp) {
- CellularService *service(SetService());
+ CellularService* service(SetService());
device_->state_ = Cellular::kStateLinked;
device_->set_ipconfig(dhcp_config_);
device_->SelectService(service);
@@ -1506,7 +1506,7 @@
// Provides expected username and password in normal case.
const char kFakeUsername[] = "fake-user";
const char kFakePassword[] = "fake-password";
- CellularService &service(*SetService());
+ CellularService& service(*SetService());
service.ppp_username_ = kFakeUsername;
service.ppp_password_ = kFakePassword;
device_->GetLogin(&username_to_pppd, &password_to_pppd);
@@ -1514,7 +1514,7 @@
TEST_F(CellularTest, Notify) {
// Common setup.
- MockPPPDeviceFactory *ppp_device_factory =
+ MockPPPDeviceFactory* ppp_device_factory =
MockPPPDeviceFactory::GetInstance();
const int kPID = 91;
device_->ppp_device_factory_ = ppp_device_factory;
@@ -1604,7 +1604,7 @@
// where pppd disconnects after connecting).
const int kPID = 52;
const map<string, string> kEmptyArgs;
- MockCellularService *service = SetMockService();
+ MockCellularService* service = SetMockService();
StartPPP(kPID);
ExpectDisconnectCapabilityUniversal();
@@ -1624,7 +1624,7 @@
// where pppd disconnects after connecting).
const int kPID = 52;
const map<string, string> kEmptyArgs;
- MockCellularService *service = SetMockService();
+ MockCellularService* service = SetMockService();
StartPPP(kPID);
ExpectDisconnectCapabilityUniversal();
@@ -1646,7 +1646,7 @@
// connecting).
const int kPID = 52;
const map<string, string> kEmptyArgs;
- MockCellularService *service = SetMockService();
+ MockCellularService* service = SetMockService();
StartPPP(kPID);
EXPECT_CALL(*service, SetFailure(Service::kFailureUnknown));
@@ -1703,7 +1703,7 @@
}
TEST_F(CellularTest, ChangeServiceState) {
- MockCellularService *service(SetMockService());
+ MockCellularService* service(SetMockService());
EXPECT_CALL(*service, SetState(_));
EXPECT_CALL(*service, SetFailure(_));
EXPECT_CALL(*service, SetFailureSilent(_));
@@ -1718,7 +1718,7 @@
}
TEST_F(CellularTest, ChangeServiceStatePPP) {
- MockCellularService *service(SetMockService());
+ MockCellularService* service(SetMockService());
scoped_refptr<MockPPPDevice> ppp_device(
new MockPPPDevice(modem_info_.control_interface(),
nullptr, nullptr, nullptr, "fake_ppp0", -1));
@@ -1763,7 +1763,7 @@
// things alone.
// Initial state.
- mm1::MockModemProxy *mm1_proxy = SetupOnAfterResume();
+ mm1::MockModemProxy* mm1_proxy = SetupOnAfterResume();
set_enabled_persistent(false);
EXPECT_FALSE(device_->running());
EXPECT_FALSE(device_->enabled_persistent());
@@ -1784,7 +1784,7 @@
// complete before we suspended. We should leave things alone.
// Initial state.
- mm1::MockModemProxy *mm1_proxy = SetupOnAfterResume();
+ mm1::MockModemProxy* mm1_proxy = SetupOnAfterResume();
Error error;
EXPECT_CALL(*mm1_proxy, Enable(true, _, _, _))
.WillOnce(Invoke(this, &CellularTest::InvokeEnable));
@@ -1826,7 +1826,7 @@
// The tests exists to document this corner case, which we get wrong.
// Initial state.
- mm1::MockModemProxy *mm1_proxy = SetupOnAfterResume();
+ mm1::MockModemProxy* mm1_proxy = SetupOnAfterResume();
EXPECT_CALL(*mm1_proxy, Enable(true, _, _, _))
.WillOnce(Invoke(this, &CellularTest::InvokeEnable));
device_->SetEnabled(true);
@@ -1899,7 +1899,7 @@
// device is currently enabled.
// Initial state.
- mm1::MockModemProxy *mm1_proxy = SetupOnAfterResume();
+ mm1::MockModemProxy* mm1_proxy = SetupOnAfterResume();
EXPECT_CALL(*mm1_proxy, Enable(true, _, _, _))
.WillOnce(Invoke(this, &CellularTest::InvokeEnable));
device_->SetEnabled(true);
@@ -1977,7 +1977,7 @@
TEST_F(CellularTest, OnAfterResumeDisabledWantEnabled) {
// This is the ideal case. The disable process completed before
// going into suspend.
- mm1::MockModemProxy *mm1_proxy = SetupOnAfterResume();
+ mm1::MockModemProxy* mm1_proxy = SetupOnAfterResume();
EXPECT_FALSE(device_->running());
EXPECT_TRUE(device_->enabled_persistent());
EXPECT_EQ(Cellular::kStateDisabled, device_->state_);
@@ -2080,7 +2080,7 @@
SetCapabilityUniversalActiveBearer(std::move(bearer));
device_->state_ = Cellular::kStateConnected;
- MockCellularService *service = SetMockService();
+ MockCellularService* service = SetMockService();
ON_CALL(*service, state()).WillByDefault(Return(Service::kStateUnknown));
EXPECT_CALL(device_info_, GetFlags(device_->interface_index(), _))
@@ -2102,7 +2102,7 @@
device_->state_ = Cellular::kStateConnected;
const int kPID = 123;
- MockGLib &mock_glib(*dynamic_cast<MockGLib *>(modem_info_.glib()));
+ MockGLib& mock_glib(*dynamic_cast<MockGLib*>(modem_info_.glib()));
EXPECT_CALL(mock_glib, ChildWatchAdd(kPID, _, _));
EXPECT_CALL(mock_glib, SpawnAsync(_, _, _, _, _, _, _, _))
.WillOnce(DoAll(SetArgumentPointee<6>(kPID), Return(true)));
@@ -2118,7 +2118,7 @@
const char kAddress[] = "10.0.0.1";
const char kGateway[] = "10.0.0.254";
const int32_t kSubnetPrefix = 16;
- const char *const kDNS[] = {"10.0.0.2", "8.8.4.4", "8.8.8.8"};
+ const char* const kDNS[] = {"10.0.0.2", "8.8.4.4", "8.8.8.8"};
unique_ptr<IPConfig::Properties> ipconfig_properties(
new IPConfig::Properties);
@@ -2135,7 +2135,7 @@
SetCapabilityUniversalActiveBearer(std::move(bearer));
device_->state_ = Cellular::kStateConnected;
- MockCellularService *service = SetMockService();
+ MockCellularService* service = SetMockService();
ON_CALL(*service, state()).WillByDefault(Return(Service::kStateUnknown));
EXPECT_CALL(device_info_, GetFlags(device_->interface_index(), _))
diff --git a/cellular/mobile_operator_info_unittest.cc b/cellular/mobile_operator_info_unittest.cc
index c865a6e..2408849 100644
--- a/cellular/mobile_operator_info_unittest.cc
+++ b/cellular/mobile_operator_info_unittest.cc
@@ -86,7 +86,7 @@
operator_info_impl_(operator_info_->impl()) {}
void TearDown() override {
- for (const auto &tmp_db_path : tmp_db_paths_) {
+ for (const auto& tmp_db_path : tmp_db_paths_) {
base::DeleteFile(tmp_db_path, false);
}
}
@@ -110,7 +110,7 @@
EXPECT_EQ(0, operator_info_impl_->database()->imvno_size());
}
- const MobileOperatorDB *GetDatabase() {
+ const MobileOperatorDB* GetDatabase() {
return operator_info_impl_->database();
}
@@ -118,7 +118,7 @@
vector<FilePath> tmp_db_paths_;
std::unique_ptr<MobileOperatorInfo> operator_info_;
// Owned by |operator_info_| and tied to its life cycle.
- MobileOperatorInfoImpl *operator_info_impl_;
+ MobileOperatorInfoImpl* operator_info_impl_;
private:
DISALLOW_COPY_AND_ASSIGN(MobileOperatorInfoInitTest);
@@ -212,13 +212,13 @@
protected:
// ///////////////////////////////////////////////////////////////////////////
// Helper functions.
- void VerifyMNOWithUUID(const string &uuid) {
+ void VerifyMNOWithUUID(const string& uuid) {
EXPECT_TRUE(operator_info_->IsMobileNetworkOperatorKnown());
EXPECT_FALSE(operator_info_->IsMobileVirtualNetworkOperatorKnown());
EXPECT_EQ(uuid, operator_info_->uuid());
}
- void VerifyMVNOWithUUID(const string &uuid) {
+ void VerifyMVNOWithUUID(const string& uuid) {
EXPECT_TRUE(operator_info_->IsMobileNetworkOperatorKnown());
EXPECT_TRUE(operator_info_->IsMobileVirtualNetworkOperatorKnown());
EXPECT_EQ(uuid, operator_info_->uuid());
@@ -254,39 +254,39 @@
// Use these wrappers to send updates to |operator_info_|. These wrappers
// optionally run the dispatcher if we want strict checking of the number of
// events raised.
- void UpdateMCCMNC(const std::string &mccmnc) {
+ void UpdateMCCMNC(const std::string& mccmnc) {
operator_info_->UpdateMCCMNC(mccmnc);
DispatchPendingEventsIfStrict();
}
- void UpdateSID(const std::string &sid) {
+ void UpdateSID(const std::string& sid) {
operator_info_->UpdateSID(sid);
DispatchPendingEventsIfStrict();
}
- void UpdateIMSI(const std::string &imsi) {
+ void UpdateIMSI(const std::string& imsi) {
operator_info_->UpdateIMSI(imsi);
DispatchPendingEventsIfStrict();
}
- void UpdateICCID(const std::string &iccid) {
+ void UpdateICCID(const std::string& iccid) {
operator_info_->UpdateICCID(iccid);
DispatchPendingEventsIfStrict();
}
- void UpdateNID(const std::string &nid) {
+ void UpdateNID(const std::string& nid) {
operator_info_->UpdateNID(nid);
DispatchPendingEventsIfStrict();
}
- void UpdateOperatorName(const std::string &operator_name) {
+ void UpdateOperatorName(const std::string& operator_name) {
operator_info_->UpdateOperatorName(operator_name);
DispatchPendingEventsIfStrict();
}
- void UpdateOnlinePortal(const std::string &url,
- const std::string &method,
- const std::string &post_data) {
+ void UpdateOnlinePortal(const std::string& url,
+ const std::string& method,
+ const std::string& post_data) {
operator_info_->UpdateOnlinePortal(url, method, post_data);
DispatchPendingEventsIfStrict();
}
@@ -1073,7 +1073,7 @@
EXPECT_EQ(mccmnc_list_.size(), operator_info_->mccmnc_list().size());
set<string> mccmnc_set(operator_info_->mccmnc_list().begin(),
operator_info_->mccmnc_list().end());
- for (const auto &mccmnc : mccmnc_list_) {
+ for (const auto& mccmnc : mccmnc_list_) {
EXPECT_TRUE(mccmnc_set.find(mccmnc) != mccmnc_set.end());
}
if (mccmnc_list_.size() > 0) {
@@ -1087,13 +1087,13 @@
// This comparison breaks if two apns have the same |apn| field.
EXPECT_EQ(apn_list_.size(), operator_info_->apn_list().size());
- map<string, const MobileOperatorInfo::MobileAPN *> mobile_apns;
- for (const auto &apn_node : operator_info_->apn_list()) {
+ map<string, const MobileOperatorInfo::MobileAPN*> mobile_apns;
+ for (const auto& apn_node : operator_info_->apn_list()) {
mobile_apns[apn_node->apn] = apn_node;
}
- for (const auto &apn_lhs : apn_list_) {
+ for (const auto& apn_lhs : apn_list_) {
ASSERT_TRUE(mobile_apns.find(apn_lhs->apn) != mobile_apns.end());
- const auto &apn_rhs = mobile_apns[apn_lhs->apn];
+ const auto& apn_rhs = mobile_apns[apn_lhs->apn];
// Only comparing apn, name, username, password.
EXPECT_EQ(apn_lhs->apn, apn_rhs->apn);
EXPECT_EQ(apn_lhs->username, apn_rhs->username);
@@ -1105,12 +1105,12 @@
EXPECT_EQ(olp_list_.size(), operator_info_->olp_list().size());
// This comparison breaks if two OLPs have the same |url|.
map<string, MobileOperatorInfo::OnlinePortal> olps;
- for (const auto &olp : operator_info_->olp_list()) {
+ for (const auto& olp : operator_info_->olp_list()) {
olps[olp.url] = olp;
}
- for (const auto &olp : olp_list_) {
+ for (const auto& olp : olp_list_) {
ASSERT_TRUE(olps.find(olp.url) != olps.end());
- const auto &olp_rhs = olps[olp.url];
+ const auto& olp_rhs = olps[olp.url];
EXPECT_EQ(olp.method, olp_rhs.method);
EXPECT_EQ(olp.post_data, olp_rhs.post_data);
}
@@ -1118,7 +1118,7 @@
EXPECT_EQ(sid_list_.size(), operator_info_->sid_list().size());
set<string> sid_set(operator_info_->sid_list().begin(),
operator_info_->sid_list().end());
- for (const auto &sid : sid_list_) {
+ for (const auto& sid : sid_list_) {
EXPECT_TRUE(sid_set.find(sid) != sid_set.end());
}
if (sid_list_.size() > 0) {
@@ -1135,14 +1135,14 @@
}
void VerifyNameListsMatch(
- const vector<MobileOperatorInfo::LocalizedName> &operator_name_list_lhs,
- const vector<MobileOperatorInfo::LocalizedName> &operator_name_list_rhs) {
+ const vector<MobileOperatorInfo::LocalizedName>& operator_name_list_lhs,
+ const vector<MobileOperatorInfo::LocalizedName>& operator_name_list_rhs) {
// This comparison breaks if two localized names have the same |name|.
map<string, MobileOperatorInfo::LocalizedName> localized_names;
- for (const auto &localized_name : operator_name_list_rhs) {
+ for (const auto& localized_name : operator_name_list_rhs) {
localized_names[localized_name.name] = localized_name;
}
- for (const auto &localized_name : operator_name_list_lhs) {
+ for (const auto& localized_name : operator_name_list_lhs) {
EXPECT_TRUE(localized_names.find(localized_name.name) !=
localized_names.end());
EXPECT_EQ(localized_name.language,
@@ -1167,7 +1167,7 @@
operator_name_list_.push_back({"name200002", ""});
apn_list_.clear();
- MobileOperatorInfo::MobileAPN *apn;
+ MobileOperatorInfo::MobileAPN* apn;
apn = new MobileOperatorInfo::MobileAPN();
apn->apn = "test@test.com";
apn->username = "testuser";
@@ -1200,7 +1200,7 @@
operator_name_list_.push_back({"name200102", ""});
apn_list_.clear();
- MobileOperatorInfo::MobileAPN *apn;
+ MobileOperatorInfo::MobileAPN* apn;
apn = new MobileOperatorInfo::MobileAPN();
apn->apn = "test2@test.com";
apn->username = "testuser2";
@@ -1470,7 +1470,7 @@
ASSERT_EQ(2, operator_info_->olp_list().size());
EXPECT_NE("olp@sid", operator_info_->olp_list()[0].url);
bool found_olp_by_mccmnc = false;
- for (const auto &olp : operator_info_->olp_list()) {
+ for (const auto& olp : operator_info_->olp_list()) {
found_olp_by_mccmnc |= ("olp@mccmnc" == olp.url);
}
EXPECT_TRUE(found_olp_by_mccmnc);
@@ -1489,7 +1489,7 @@
ASSERT_EQ(2, operator_info_->olp_list().size());
EXPECT_NE("olp@mccmnc", operator_info_->olp_list()[0].url);
bool found_olp_by_sid = false;
- for (const auto &olp : operator_info_->olp_list()) {
+ for (const auto& olp : operator_info_->olp_list()) {
found_olp_by_sid |= ("olp@sid" == olp.url);
}
EXPECT_TRUE(found_olp_by_sid);
diff --git a/cellular/mock_cellular.cc b/cellular/mock_cellular.cc
index 509e7d4..22f0b9b 100644
--- a/cellular/mock_cellular.cc
+++ b/cellular/mock_cellular.cc
@@ -13,15 +13,15 @@
// TODO(rochberg): The cellular constructor does work. Ought to fix
// this so that we don't depend on passing real values in for Type.
-MockCellular::MockCellular(ModemInfo *modem_info,
- const std::string &link_name,
- const std::string &address,
+MockCellular::MockCellular(ModemInfo* modem_info,
+ const std::string& link_name,
+ const std::string& address,
int interface_index,
Type type,
- const std::string &owner,
- const std::string &service,
- const std::string &path,
- ProxyFactory *proxy_factory)
+ const std::string& owner,
+ const std::string& service,
+ const std::string& path,
+ ProxyFactory* proxy_factory)
: Cellular(modem_info, link_name, address, interface_index, type, owner,
service, path, proxy_factory) {}
diff --git a/cellular/mock_cellular.h b/cellular/mock_cellular.h
index 7d57148..b5a517d 100644
--- a/cellular/mock_cellular.h
+++ b/cellular/mock_cellular.h
@@ -16,26 +16,26 @@
class MockCellular : public Cellular {
public:
- MockCellular(ModemInfo *modem_info,
- const std::string &link_name,
- const std::string &address,
+ MockCellular(ModemInfo* modem_info,
+ const std::string& link_name,
+ const std::string& address,
int interface_index,
Type type,
- const std::string &owner,
- const std::string &service,
- const std::string &path,
- ProxyFactory *proxy_factory);
+ const std::string& owner,
+ const std::string& service,
+ const std::string& path,
+ ProxyFactory* proxy_factory);
~MockCellular() override;
- MOCK_METHOD1(Connect, void(Error *error));
- MOCK_METHOD2(Disconnect, void(Error *error, const char *reason));
+ MOCK_METHOD1(Connect, void(Error* error));
+ MOCK_METHOD2(Disconnect, void(Error* error, const char* reason));
MOCK_METHOD3(OnDBusPropertiesChanged, void(
- const std::string &interface,
- const DBusPropertiesMap &changed_properties,
- const std::vector<std::string> &invalidated_properties));
+ const std::string& interface,
+ const DBusPropertiesMap& changed_properties,
+ const std::vector<std::string>& invalidated_properties));
MOCK_METHOD1(set_modem_state, void(ModemState state));
MOCK_METHOD0(DestroyService, void());
- MOCK_METHOD1(StartPPP, void(const std::string &serial_device));
+ MOCK_METHOD1(StartPPP, void(const std::string& serial_device));
private:
DISALLOW_COPY_AND_ASSIGN(MockCellular);
diff --git a/cellular/mock_cellular_service.cc b/cellular/mock_cellular_service.cc
index 64e7d2b..7de2cc3 100644
--- a/cellular/mock_cellular_service.cc
+++ b/cellular/mock_cellular_service.cc
@@ -10,8 +10,8 @@
namespace shill {
-MockCellularService::MockCellularService(ModemInfo *modem_info,
- const CellularRefPtr &device)
+MockCellularService::MockCellularService(ModemInfo* modem_info,
+ const CellularRefPtr& device)
: CellularService(modem_info, device),
default_activation_state_(kActivationStateUnknown) {
ON_CALL(*this, activation_state())
diff --git a/cellular/mock_cellular_service.h b/cellular/mock_cellular_service.h
index f78d852..f6fd566 100644
--- a/cellular/mock_cellular_service.h
+++ b/cellular/mock_cellular_service.h
@@ -15,23 +15,23 @@
class MockCellularService : public CellularService {
public:
- MockCellularService(ModemInfo *modem_info,
- const CellularRefPtr &device);
+ MockCellularService(ModemInfo* modem_info,
+ const CellularRefPtr& device);
~MockCellularService() override;
MOCK_METHOD0(AutoConnect, void());
- MOCK_METHOD1(SetLastGoodApn, void(const Stringmap &apn_info));
+ MOCK_METHOD1(SetLastGoodApn, void(const Stringmap& apn_info));
MOCK_METHOD0(ClearLastGoodApn, void());
- MOCK_METHOD1(SetActivationState, void(const std::string &state));
- MOCK_METHOD2(Connect, void(Error *error, const char *reason));
- MOCK_METHOD2(Disconnect, void(Error *error, const char *reason));
+ MOCK_METHOD1(SetActivationState, void(const std::string& state));
+ MOCK_METHOD2(Connect, void(Error* error, const char* reason));
+ MOCK_METHOD2(Disconnect, void(Error* error, const char* reason));
MOCK_METHOD1(SetState, void(ConnectState state));
MOCK_METHOD1(SetFailure, void(ConnectFailure failure));
MOCK_METHOD1(SetFailureSilent, void(ConnectFailure failure));
MOCK_CONST_METHOD0(state, ConnectState());
MOCK_CONST_METHOD0(explicitly_disconnected, bool());
- MOCK_CONST_METHOD0(activation_state, const std::string &());
- MOCK_CONST_METHOD0(resume_start_time, const base::Time &());
+ MOCK_CONST_METHOD0(activation_state, const std::string&());
+ MOCK_CONST_METHOD0(resume_start_time, const base::Time&());
private:
std::string default_activation_state_;
diff --git a/cellular/mock_dbus_objectmanager_proxy.h b/cellular/mock_dbus_objectmanager_proxy.h
index 0e50c1b..56da134 100644
--- a/cellular/mock_dbus_objectmanager_proxy.h
+++ b/cellular/mock_dbus_objectmanager_proxy.h
@@ -17,13 +17,13 @@
MockDBusObjectManagerProxy();
~MockDBusObjectManagerProxy() override;
- MOCK_METHOD3(GetManagedObjects, void(Error *error,
- const ManagedObjectsCallback &callback,
+ MOCK_METHOD3(GetManagedObjects, void(Error* error,
+ const ManagedObjectsCallback& callback,
int timeout));
MOCK_METHOD1(set_interfaces_added_callback,
- void(const InterfacesAddedSignalCallback &callback));
+ void(const InterfacesAddedSignalCallback& callback));
MOCK_METHOD1(set_interfaces_removed_callback,
- void(const InterfacesRemovedSignalCallback &callback));
+ void(const InterfacesRemovedSignalCallback& callback));
void IgnoreSetCallbacks();
private:
diff --git a/cellular/mock_mm1_bearer_proxy.h b/cellular/mock_mm1_bearer_proxy.h
index e478967..c35c300 100644
--- a/cellular/mock_mm1_bearer_proxy.h
+++ b/cellular/mock_mm1_bearer_proxy.h
@@ -19,11 +19,11 @@
MockBearerProxy();
~MockBearerProxy() override;
- MOCK_METHOD3(Connect, void(Error *error,
- const ResultCallback &callback,
+ MOCK_METHOD3(Connect, void(Error* error,
+ const ResultCallback& callback,
int timeout));
- MOCK_METHOD3(Disconnect, void(Error *error,
- const ResultCallback &callback,
+ MOCK_METHOD3(Disconnect, void(Error* error,
+ const ResultCallback& callback,
int timeout));
};
diff --git a/cellular/mock_mm1_modem_location_proxy.h b/cellular/mock_mm1_modem_location_proxy.h
index 3324807..38c9b6e 100644
--- a/cellular/mock_mm1_modem_location_proxy.h
+++ b/cellular/mock_mm1_modem_location_proxy.h
@@ -21,12 +21,12 @@
// Inherited methods from ModemLocationProxyInterface.
MOCK_METHOD5(Setup, void(uint32_t sources,
bool signal_location,
- Error *error,
- const ResultCallback &callback,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
- MOCK_METHOD3(GetLocation, void(Error *error,
- const DBusEnumValueMapCallback &callback,
+ MOCK_METHOD3(GetLocation, void(Error* error,
+ const DBusEnumValueMapCallback& callback,
int timeout));
private:
diff --git a/cellular/mock_mm1_modem_modem3gpp_proxy.h b/cellular/mock_mm1_modem_modem3gpp_proxy.h
index 7e9bba4..106002f 100644
--- a/cellular/mock_mm1_modem_modem3gpp_proxy.h
+++ b/cellular/mock_mm1_modem_modem3gpp_proxy.h
@@ -20,12 +20,12 @@
MockModemModem3gppProxy();
~MockModemModem3gppProxy() override;
- MOCK_METHOD4(Register, void(const std::string &operator_id,
- Error *error,
- const ResultCallback &callback,
+ MOCK_METHOD4(Register, void(const std::string& operator_id,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
- MOCK_METHOD3(Scan, void(Error *error,
- const DBusPropertyMapsCallback &callback,
+ MOCK_METHOD3(Scan, void(Error* error,
+ const DBusPropertyMapsCallback& callback,
int timeout));
private:
diff --git a/cellular/mock_mm1_modem_modemcdma_proxy.h b/cellular/mock_mm1_modem_modemcdma_proxy.h
index 39c2f83..88b4a45 100644
--- a/cellular/mock_mm1_modem_modemcdma_proxy.h
+++ b/cellular/mock_mm1_modem_modemcdma_proxy.h
@@ -21,19 +21,19 @@
~MockModemModemCdmaProxy() override;
MOCK_METHOD4(Activate, void(
- const std::string &carrier,
- Error *error,
- const ResultCallback &callback,
+ const std::string& carrier,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
MOCK_METHOD4(ActivateManual, void(
- const DBusPropertiesMap &properties,
- Error *error,
- const ResultCallback &callback,
+ const DBusPropertiesMap& properties,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
MOCK_METHOD1(set_activation_state_callback,
- void(const ActivationStateSignalCallback &callback));
+ void(const ActivationStateSignalCallback& callback));
private:
DISALLOW_COPY_AND_ASSIGN(MockModemModemCdmaProxy);
diff --git a/cellular/mock_mm1_modem_proxy.h b/cellular/mock_mm1_modem_proxy.h
index 3fce369..215c277 100644
--- a/cellular/mock_mm1_modem_proxy.h
+++ b/cellular/mock_mm1_modem_proxy.h
@@ -23,48 +23,48 @@
// Inherited methods from ModemProxyInterface.
MOCK_METHOD4(Enable, void(bool enable,
- Error *error,
- const ResultCallback &callback,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
- MOCK_METHOD4(CreateBearer, void(const DBusPropertiesMap &properties,
- Error *error,
- const DBusPathCallback &callback,
+ MOCK_METHOD4(CreateBearer, void(const DBusPropertiesMap& properties,
+ Error* error,
+ const DBusPathCallback& callback,
int timeout));
- MOCK_METHOD4(DeleteBearer, void(const ::DBus::Path &bearer,
- Error *error,
- const ResultCallback &callback,
+ MOCK_METHOD4(DeleteBearer, void(const ::DBus::Path& bearer,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
- MOCK_METHOD3(Reset, void(Error *error,
- const ResultCallback &callback,
+ MOCK_METHOD3(Reset, void(Error* error,
+ const ResultCallback& callback,
int timeout));
- MOCK_METHOD4(FactoryReset, void(const std::string &code,
- Error *error,
- const ResultCallback &callback,
+ MOCK_METHOD4(FactoryReset, void(const std::string& code,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
- MOCK_METHOD4(SetCurrentCapabilities, void(const uint32_t &capabilities,
- Error *error,
- const ResultCallback &callback,
+ MOCK_METHOD4(SetCurrentCapabilities, void(const uint32_t& capabilities,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
MOCK_METHOD4(SetCurrentModes,
- void(const ::DBus::Struct<uint32_t, uint32_t> &modes,
- Error *error,
- const ResultCallback &callback,
+ void(const ::DBus::Struct<uint32_t, uint32_t>& modes,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
- MOCK_METHOD4(SetCurrentBands, void(const std::vector<uint32_t> &bands,
- Error *error,
- const ResultCallback &callback,
+ MOCK_METHOD4(SetCurrentBands, void(const std::vector<uint32_t>& bands,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
- MOCK_METHOD5(Command, void(const std::string &cmd,
- const uint32_t &user_timeout,
- Error *error,
- const StringCallback &callback,
+ MOCK_METHOD5(Command, void(const std::string& cmd,
+ const uint32_t& user_timeout,
+ Error* error,
+ const StringCallback& callback,
int timeout));
- MOCK_METHOD4(SetPowerState, void(const uint32_t &power_state,
- Error *error,
- const ResultCallback &callback,
+ MOCK_METHOD4(SetPowerState, void(const uint32_t& power_state,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
MOCK_METHOD1(set_state_changed_callback, void(
- const ModemStateChangedSignalCallback &callback));
+ const ModemStateChangedSignalCallback& callback));
private:
DISALLOW_COPY_AND_ASSIGN(MockModemProxy);
diff --git a/cellular/mock_mm1_modem_simple_proxy.h b/cellular/mock_mm1_modem_simple_proxy.h
index e0f1863..0c3c9c7 100644
--- a/cellular/mock_mm1_modem_simple_proxy.h
+++ b/cellular/mock_mm1_modem_simple_proxy.h
@@ -20,16 +20,16 @@
MockModemSimpleProxy();
~MockModemSimpleProxy() override;
- MOCK_METHOD4(Connect, void(const DBusPropertiesMap &properties,
- Error *error,
- const DBusPathCallback &callback,
+ MOCK_METHOD4(Connect, void(const DBusPropertiesMap& properties,
+ Error* error,
+ const DBusPathCallback& callback,
int timeout));
- MOCK_METHOD4(Disconnect, void(const ::DBus::Path &bearer,
- Error *error,
- const ResultCallback &callback,
+ MOCK_METHOD4(Disconnect, void(const ::DBus::Path& bearer,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
- MOCK_METHOD3(GetStatus, void(Error *error,
- const DBusPropertyMapCallback &callback,
+ MOCK_METHOD3(GetStatus, void(Error* error,
+ const DBusPropertyMapCallback& callback,
int timeout));
private:
DISALLOW_COPY_AND_ASSIGN(MockModemSimpleProxy);
diff --git a/cellular/mock_mm1_modem_time_proxy.h b/cellular/mock_mm1_modem_time_proxy.h
index 2dd1e09..9eb63f4 100644
--- a/cellular/mock_mm1_modem_time_proxy.h
+++ b/cellular/mock_mm1_modem_time_proxy.h
@@ -19,12 +19,12 @@
~MockModemTimeProxy() override;
// Inherited methods from ModemTimeProxyInterface.
- MOCK_METHOD3(GetNetworkTime, void(Error *error,
- const StringCallback &callback,
+ MOCK_METHOD3(GetNetworkTime, void(Error* error,
+ const StringCallback& callback,
int timeout));
MOCK_METHOD1(set_network_time_changed_callback,
- void(const NetworkTimeChangedSignalCallback &callback));
+ void(const NetworkTimeChangedSignalCallback& callback));
private:
DISALLOW_COPY_AND_ASSIGN(MockModemTimeProxy);
diff --git a/cellular/mock_mm1_sim_proxy.h b/cellular/mock_mm1_sim_proxy.h
index 5282439..3b7fee3 100644
--- a/cellular/mock_mm1_sim_proxy.h
+++ b/cellular/mock_mm1_sim_proxy.h
@@ -20,24 +20,24 @@
MockSimProxy();
~MockSimProxy() override;
- MOCK_METHOD4(SendPin, void(const std::string &pin,
- Error *error,
- const ResultCallback &callback,
+ MOCK_METHOD4(SendPin, void(const std::string& pin,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
- MOCK_METHOD5(SendPuk, void(const std::string &puk,
- const std::string &pin,
- Error *error,
- const ResultCallback &callback,
+ MOCK_METHOD5(SendPuk, void(const std::string& puk,
+ const std::string& pin,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
- MOCK_METHOD5(EnablePin, void(const std::string &pin,
+ MOCK_METHOD5(EnablePin, void(const std::string& pin,
const bool enabled,
- Error *error,
- const ResultCallback &callback,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
- MOCK_METHOD5(ChangePin, void(const std::string &old_pin,
- const std::string &new_pin,
- Error *error,
- const ResultCallback &callback,
+ MOCK_METHOD5(ChangePin, void(const std::string& old_pin,
+ const std::string& new_pin,
+ Error* error,
+ const ResultCallback& callback,
int timeout));
private:
diff --git a/cellular/mock_mobile_operator_info.cc b/cellular/mock_mobile_operator_info.cc
index 2027a87..d4221e4 100644
--- a/cellular/mock_mobile_operator_info.cc
+++ b/cellular/mock_mobile_operator_info.cc
@@ -8,8 +8,8 @@
namespace shill {
-MockMobileOperatorInfo::MockMobileOperatorInfo(EventDispatcher *dispatcher,
- const std::string &info_owner)
+MockMobileOperatorInfo::MockMobileOperatorInfo(EventDispatcher* dispatcher,
+ const std::string& info_owner)
: MobileOperatorInfo(dispatcher, info_owner) {}
MockMobileOperatorInfo::~MockMobileOperatorInfo() {}
diff --git a/cellular/mock_mobile_operator_info.h b/cellular/mock_mobile_operator_info.h
index 6c65c9c..c043bd7 100644
--- a/cellular/mock_mobile_operator_info.h
+++ b/cellular/mock_mobile_operator_info.h
@@ -18,25 +18,25 @@
class MockMobileOperatorInfo : public MobileOperatorInfo {
public:
- MockMobileOperatorInfo(EventDispatcher *dispatcher,
- const std::string &info_owner);
+ MockMobileOperatorInfo(EventDispatcher* dispatcher,
+ const std::string& info_owner);
~MockMobileOperatorInfo() override;
MOCK_CONST_METHOD0(IsMobileNetworkOperatorKnown, bool());
- MOCK_CONST_METHOD0(mccmnc, const std::string &());
+ MOCK_CONST_METHOD0(mccmnc, const std::string&());
MOCK_CONST_METHOD0(olp_list,
- const std::vector<MobileOperatorInfo::OnlinePortal> &());
- MOCK_CONST_METHOD0(activation_code, const std::string &());
- MOCK_CONST_METHOD0(operator_name, const std::string &());
- MOCK_CONST_METHOD0(country, const std::string &());
- MOCK_CONST_METHOD0(uuid, const std::string &());
+ const std::vector<MobileOperatorInfo::OnlinePortal>&());
+ MOCK_CONST_METHOD0(activation_code, const std::string&());
+ MOCK_CONST_METHOD0(operator_name, const std::string&());
+ MOCK_CONST_METHOD0(country, const std::string&());
+ MOCK_CONST_METHOD0(uuid, const std::string&());
- MOCK_METHOD1(UpdateMCCMNC, void(const std::string &));
- MOCK_METHOD1(UpdateSID, void(const std::string &));
- MOCK_METHOD1(UpdateIMSI, void(const std::string &));
- MOCK_METHOD1(UpdateNID, void(const std::string &));
- MOCK_METHOD1(UpdateOperatorName, void(const std::string &));
+ MOCK_METHOD1(UpdateMCCMNC, void(const std::string&));
+ MOCK_METHOD1(UpdateSID, void(const std::string&));
+ MOCK_METHOD1(UpdateIMSI, void(const std::string&));
+ MOCK_METHOD1(UpdateNID, void(const std::string&));
+ MOCK_METHOD1(UpdateOperatorName, void(const std::string&));
// Sets up the mock object to return empty strings/vectors etc for all
// propeties.
diff --git a/cellular/mock_modem.cc b/cellular/mock_modem.cc
index 782c6d5..a5c44db 100644
--- a/cellular/mock_modem.cc
+++ b/cellular/mock_modem.cc
@@ -6,10 +6,10 @@
namespace shill {
-MockModem::MockModem(const std::string &owner,
- const std::string &service,
- const std::string &path,
- ModemInfo *modem_info)
+MockModem::MockModem(const std::string& owner,
+ const std::string& service,
+ const std::string& path,
+ ModemInfo* modem_info)
: Modem(owner, service, path, modem_info) {}
MockModem::~MockModem() {}
diff --git a/cellular/mock_modem.h b/cellular/mock_modem.h
index 01b7f6c..32a2a77 100644
--- a/cellular/mock_modem.h
+++ b/cellular/mock_modem.h
@@ -15,25 +15,25 @@
class MockModem : public Modem {
public:
- MockModem(const std::string &owner,
- const std::string &service,
- const std::string &path,
- ModemInfo *modem_info);
+ MockModem(const std::string& owner,
+ const std::string& service,
+ const std::string& path,
+ ModemInfo* modem_info);
~MockModem() override;
// This class only mocks the pure virtual methods; if you need a
// more thorough mock, know that modem_unittest.cc depends on the
// incompleteness of this mock.
MOCK_METHOD1(SetModemStateFromProperties,
- void(const DBusPropertiesMap &properties));
+ void(const DBusPropertiesMap& properties));
MOCK_CONST_METHOD2(GetLinkName,
- bool(const DBusPropertiesMap &modem_properties,
- std::string *name));
+ bool(const DBusPropertiesMap& modem_properties,
+ std::string* name));
MOCK_CONST_METHOD0(GetModemInterface,
std::string(void));
- MOCK_METHOD3(ConstructCellular, Cellular *(
- const std::string &link_name,
- const std::string &device_name,
+ MOCK_METHOD3(ConstructCellular, Cellular*(
+ const std::string& link_name,
+ const std::string& device_name,
int ifindex));
};
typedef ::testing::StrictMock<MockModem> StrictModem;
diff --git a/cellular/mock_modem_cdma_proxy.h b/cellular/mock_modem_cdma_proxy.h
index 0086691..8a8954d 100644
--- a/cellular/mock_modem_cdma_proxy.h
+++ b/cellular/mock_modem_cdma_proxy.h
@@ -19,22 +19,22 @@
MockModemCDMAProxy();
~MockModemCDMAProxy() override;
- MOCK_METHOD4(Activate, void(const std::string &carrier, Error *error,
- const ActivationResultCallback &callback,
+ MOCK_METHOD4(Activate, void(const std::string& carrier, Error* error,
+ const ActivationResultCallback& callback,
int timeout));
MOCK_METHOD3(GetRegistrationState,
- void(Error *error, const RegistrationStateCallback &callback,
+ void(Error* error, const RegistrationStateCallback& callback,
int timeout));
- MOCK_METHOD3(GetSignalQuality, void(Error *error,
- const SignalQualityCallback &callback,
+ MOCK_METHOD3(GetSignalQuality, void(Error* error,
+ const SignalQualityCallback& callback,
int timeout));
MOCK_METHOD0(MEID, const std::string());
MOCK_METHOD1(set_activation_state_callback,
- void(const ActivationStateSignalCallback &callback));
+ void(const ActivationStateSignalCallback& callback));
MOCK_METHOD1(set_signal_quality_callback,
- void(const SignalQualitySignalCallback &callback));
+ void(const SignalQualitySignalCallback& callback));
MOCK_METHOD1(set_registration_state_callback,
- void(const RegistrationStateSignalCallback &callback));
+ void(const RegistrationStateSignalCallback& callback));
private:
DISALLOW_COPY_AND_ASSIGN(MockModemCDMAProxy);
diff --git a/cellular/mock_modem_gobi_proxy.h b/cellular/mock_modem_gobi_proxy.h
index f05c867..d824cae 100644
--- a/cellular/mock_modem_gobi_proxy.h
+++ b/cellular/mock_modem_gobi_proxy.h
@@ -19,8 +19,8 @@
MockModemGobiProxy();
~MockModemGobiProxy() override;
- MOCK_METHOD4(SetCarrier, void(const std::string &carrier,
- Error *error, const ResultCallback &callback,
+ MOCK_METHOD4(SetCarrier, void(const std::string& carrier,
+ Error* error, const ResultCallback& callback,
int timeout));
private:
diff --git a/cellular/mock_modem_gsm_card_proxy.h b/cellular/mock_modem_gsm_card_proxy.h
index 6ea2b9f..554feb9 100644
--- a/cellular/mock_modem_gsm_card_proxy.h
+++ b/cellular/mock_modem_gsm_card_proxy.h
@@ -19,31 +19,31 @@
MockModemGSMCardProxy();
~MockModemGSMCardProxy() override;
- MOCK_METHOD3(GetIMEI, void(Error *error,
- const GSMIdentifierCallback &callback,
+ MOCK_METHOD3(GetIMEI, void(Error* error,
+ const GSMIdentifierCallback& callback,
int timeout));
- MOCK_METHOD3(GetIMSI, void(Error *error,
- const GSMIdentifierCallback &callback,
+ MOCK_METHOD3(GetIMSI, void(Error* error,
+ const GSMIdentifierCallback& callback,
int timeout));
- MOCK_METHOD3(GetSPN, void(Error *error,
- const GSMIdentifierCallback &callback,
+ MOCK_METHOD3(GetSPN, void(Error* error,
+ const GSMIdentifierCallback& callback,
int timeout));
- MOCK_METHOD3(GetMSISDN, void(Error *error,
- const GSMIdentifierCallback &callback,
+ MOCK_METHOD3(GetMSISDN, void(Error* error,
+ const GSMIdentifierCallback& callback,
int timeout));
- MOCK_METHOD5(EnablePIN, void(const std::string &pin, bool enabled,
- Error *error, const ResultCallback &callback,
+ MOCK_METHOD5(EnablePIN, void(const std::string& pin, bool enabled,
+ Error* error, const ResultCallback& callback,
int timeout));
- MOCK_METHOD4(SendPIN, void(const std::string &pin,
- Error *error, const ResultCallback &callback,
+ MOCK_METHOD4(SendPIN, void(const std::string& pin,
+ Error* error, const ResultCallback& callback,
int timeout));
- MOCK_METHOD5(SendPUK, void(const std::string &puk, const std::string &pin,
- Error *error, const ResultCallback &callback,
+ MOCK_METHOD5(SendPUK, void(const std::string& puk, const std::string& pin,
+ Error* error, const ResultCallback& callback,
int timeout));
- MOCK_METHOD5(ChangePIN, void(const std::string &old_pin,
- const std::string &new_pin,
- Error *error, const ResultCallback &callback,
+ MOCK_METHOD5(ChangePIN, void(const std::string& old_pin,
+ const std::string& new_pin,
+ Error* error, const ResultCallback& callback,
int timeout));
MOCK_METHOD0(EnabledFacilityLocks, uint32_t());
diff --git a/cellular/mock_modem_gsm_network_proxy.h b/cellular/mock_modem_gsm_network_proxy.h
index 070f63d..920792a 100644
--- a/cellular/mock_modem_gsm_network_proxy.h
+++ b/cellular/mock_modem_gsm_network_proxy.h
@@ -20,22 +20,22 @@
~MockModemGSMNetworkProxy() override;
MOCK_METHOD3(GetRegistrationInfo,
- void(Error *error, const RegistrationInfoCallback &callback,
+ void(Error* error, const RegistrationInfoCallback& callback,
int timeout));
- MOCK_METHOD3(GetSignalQuality, void(Error *error,
- const SignalQualityCallback &callback,
+ MOCK_METHOD3(GetSignalQuality, void(Error* error,
+ const SignalQualityCallback& callback,
int timeout));
- MOCK_METHOD4(Register, void(const std::string &network_id, Error *error,
- const ResultCallback &callback, int timeout));
- MOCK_METHOD3(Scan, void(Error *error, const ScanResultsCallback &callback,
+ MOCK_METHOD4(Register, void(const std::string& network_id, Error* error,
+ const ResultCallback& callback, int timeout));
+ MOCK_METHOD3(Scan, void(Error* error, const ScanResultsCallback& callback,
int timeout));
MOCK_METHOD0(AccessTechnology, uint32_t());
MOCK_METHOD1(set_signal_quality_callback,
- void(const SignalQualitySignalCallback &callback));
+ void(const SignalQualitySignalCallback& callback));
MOCK_METHOD1(set_network_mode_callback,
- void(const NetworkModeSignalCallback &callback));
+ void(const NetworkModeSignalCallback& callback));
MOCK_METHOD1(set_registration_info_callback,
- void(const RegistrationInfoSignalCallback &callback));
+ void(const RegistrationInfoSignalCallback& callback));
private:
DISALLOW_COPY_AND_ASSIGN(MockModemGSMNetworkProxy);
diff --git a/cellular/mock_modem_info.cc b/cellular/mock_modem_info.cc
index 262dd0e..7f1c95e 100644
--- a/cellular/mock_modem_info.cc
+++ b/cellular/mock_modem_info.cc
@@ -10,11 +10,11 @@
ModemInfo(nullptr, nullptr, nullptr, nullptr, nullptr),
mock_pending_activation_store_(nullptr) {}
-MockModemInfo::MockModemInfo(ControlInterface *control,
- EventDispatcher *dispatcher,
- Metrics *metrics,
- Manager *manager,
- GLib *glib) :
+MockModemInfo::MockModemInfo(ControlInterface* control,
+ EventDispatcher* dispatcher,
+ Metrics* metrics,
+ Manager* manager,
+ GLib* glib) :
ModemInfo(control, dispatcher, metrics, manager, glib),
mock_pending_activation_store_(nullptr) {
SetMockMembers();
diff --git a/cellular/mock_modem_info.h b/cellular/mock_modem_info.h
index 093ed76..40b5eed 100644
--- a/cellular/mock_modem_info.h
+++ b/cellular/mock_modem_info.h
@@ -26,11 +26,11 @@
MockModemInfo();
// All nullptr parameters are replaced by mock objects.
- MockModemInfo(ControlInterface *control,
- EventDispatcher *dispatcher,
- Metrics *metrics,
- Manager *manager,
- GLib *glib);
+ MockModemInfo(ControlInterface* control,
+ EventDispatcher* dispatcher,
+ Metrics* metrics,
+ Manager* manager,
+ GLib* glib);
~MockModemInfo() override;
@@ -62,7 +62,7 @@
MOCK_METHOD0(Start, void());
MOCK_METHOD0(Stop, void());
- MOCK_METHOD1(OnDeviceInfoAvailable, void(const std::string &link_name));
+ MOCK_METHOD1(OnDeviceInfoAvailable, void(const std::string& link_name));
private:
std::unique_ptr<MockControl> mock_control_;
@@ -72,7 +72,7 @@
std::unique_ptr<MockGLib> mock_glib_;
// owned by ModemInfo
- MockPendingActivationStore *mock_pending_activation_store_;
+ MockPendingActivationStore* mock_pending_activation_store_;
DISALLOW_COPY_AND_ASSIGN(MockModemInfo);
};
diff --git a/cellular/mock_modem_proxy.h b/cellular/mock_modem_proxy.h
index ae1bade..b72c185 100644
--- a/cellular/mock_modem_proxy.h
+++ b/cellular/mock_modem_proxy.h
@@ -17,15 +17,15 @@
MockModemProxy();
~MockModemProxy() override;
- MOCK_METHOD4(Enable, void(bool enable, Error *error,
- const ResultCallback &callback, int timeout));
- MOCK_METHOD3(Disconnect, void(Error *error, const ResultCallback &callback,
+ MOCK_METHOD4(Enable, void(bool enable, Error* error,
+ const ResultCallback& callback, int timeout));
+ MOCK_METHOD3(Disconnect, void(Error* error, const ResultCallback& callback,
int timeout));
- MOCK_METHOD3(GetModemInfo, void(Error *error,
- const ModemInfoCallback &callback,
+ MOCK_METHOD3(GetModemInfo, void(Error* error,
+ const ModemInfoCallback& callback,
int timeout));
MOCK_METHOD1(set_state_changed_callback,
- void(const ModemStateChangedSignalCallback &callback));
+ void(const ModemStateChangedSignalCallback& callback));
private:
DISALLOW_COPY_AND_ASSIGN(MockModemProxy);
diff --git a/cellular/mock_modem_simple_proxy.h b/cellular/mock_modem_simple_proxy.h
index df7b951..0e50d78 100644
--- a/cellular/mock_modem_simple_proxy.h
+++ b/cellular/mock_modem_simple_proxy.h
@@ -17,11 +17,11 @@
MockModemSimpleProxy();
~MockModemSimpleProxy() override;
- MOCK_METHOD3(GetModemStatus, void(Error *error,
- const DBusPropertyMapCallback &callback,
+ MOCK_METHOD3(GetModemStatus, void(Error* error,
+ const DBusPropertyMapCallback& callback,
int timeout));
- MOCK_METHOD4(Connect, void(const DBusPropertiesMap &properties,
- Error *error, const ResultCallback &callback,
+ MOCK_METHOD4(Connect, void(const DBusPropertiesMap& properties,
+ Error* error, const ResultCallback& callback,
int timeout));
private:
diff --git a/cellular/mock_out_of_credits_detector.cc b/cellular/mock_out_of_credits_detector.cc
index 76e9ccf..6c4349f 100644
--- a/cellular/mock_out_of_credits_detector.cc
+++ b/cellular/mock_out_of_credits_detector.cc
@@ -9,10 +9,10 @@
namespace shill {
MockOutOfCreditsDetector::MockOutOfCreditsDetector(
- EventDispatcher *dispatcher,
- Manager *manager,
- Metrics *metrics,
- CellularService *service)
+ EventDispatcher* dispatcher,
+ Manager* manager,
+ Metrics* metrics,
+ CellularService* service)
: OutOfCreditsDetector(dispatcher, manager, metrics, service) {}
MockOutOfCreditsDetector::~MockOutOfCreditsDetector() {}
diff --git a/cellular/mock_out_of_credits_detector.h b/cellular/mock_out_of_credits_detector.h
index 7fed4e5..643d93a 100644
--- a/cellular/mock_out_of_credits_detector.h
+++ b/cellular/mock_out_of_credits_detector.h
@@ -13,10 +13,10 @@
class MockOutOfCreditsDetector : public OutOfCreditsDetector {
public:
- MockOutOfCreditsDetector(EventDispatcher *dispatcher,
- Manager *manager,
- Metrics *metrics,
- CellularService *service);
+ MockOutOfCreditsDetector(EventDispatcher* dispatcher,
+ Manager* manager,
+ Metrics* metrics,
+ CellularService* service);
~MockOutOfCreditsDetector() override;
MOCK_METHOD0(ResetDetector, void());
diff --git a/cellular/modem_info_unittest.cc b/cellular/modem_info_unittest.cc
index 8224919..255c13d 100644
--- a/cellular/modem_info_unittest.cc
+++ b/cellular/modem_info_unittest.cc
@@ -44,7 +44,7 @@
EventDispatcher dispatcher_;
MockMetrics metrics_;
MockManager manager_;
- MockDBusServiceProxy *dbus_service_proxy_;
+ MockDBusServiceProxy* dbus_service_proxy_;
ModemInfo modem_info_;
};
@@ -66,7 +66,7 @@
modem_info_.RegisterModemManager(
new ModemManagerClassic(kService, "/dbus/service/path", &modem_info_));
ASSERT_EQ(1, modem_info_.modem_managers_.size());
- ModemManager *manager = modem_info_.modem_managers_[0];
+ ModemManager* manager = modem_info_.modem_managers_[0];
EXPECT_EQ(kService, manager->service_);
EXPECT_EQ(&modem_info_, manager->modem_info_);
}
diff --git a/cellular/modem_manager_unittest.cc b/cellular/modem_manager_unittest.cc
index ececf60..e59d020 100644
--- a/cellular/modem_manager_unittest.cc
+++ b/cellular/modem_manager_unittest.cc
@@ -60,7 +60,7 @@
MockManager manager_;
MockModemInfo modem_info_;
MockProxyFactory proxy_factory_;
- MockDBusServiceProxy *dbus_service_proxy_;
+ MockDBusServiceProxy* dbus_service_proxy_;
};
const char ModemManagerTest::kService[] = "org.chromium.ModemManager";
@@ -153,9 +153,9 @@
class ModemManagerClassicMockInit : public ModemManagerClassic {
public:
- ModemManagerClassicMockInit(const string &service,
- const string &path,
- ModemInfo *modem_info_) :
+ ModemManagerClassicMockInit(const string& service,
+ const string& path,
+ ModemInfo* modem_info_) :
ModemManagerClassic(service, path, modem_info_) {}
MOCK_METHOD1(InitModemClassic, void(shared_ptr<ModemClassic>));
@@ -202,12 +202,12 @@
class ModemManager1MockInit : public ModemManager1 {
public:
- ModemManager1MockInit(const string &service,
- const string &path,
- ModemInfo *modem_info_) :
+ ModemManager1MockInit(const string& service,
+ const string& path,
+ ModemInfo* modem_info_) :
ModemManager1(service, path, modem_info_) {}
MOCK_METHOD2(InitModem1, void(shared_ptr<Modem1>,
- const DBusInterfaceToProperties &));
+ const DBusInterfaceToProperties&));
};
@@ -228,7 +228,7 @@
modem_manager_.proxy_factory_ = nullptr;
}
- void Connect(const DBusObjectsWithProperties &expected_objects) {
+ void Connect(const DBusObjectsWithProperties& expected_objects) {
EXPECT_CALL(proxy_factory_, CreateDBusObjectManagerProxy(kPath, kOwner))
.WillOnce(ReturnAndReleasePointee(&proxy_));
EXPECT_CALL(*proxy_, set_interfaces_added_callback(_));
diff --git a/cellular/modem_unittest.cc b/cellular/modem_unittest.cc
index e0434fa..e7b0c31 100644
--- a/cellular/modem_unittest.cc
+++ b/cellular/modem_unittest.cc
@@ -127,7 +127,7 @@
Return(true)));
// modem will take ownership
- MockCellular *cellular = new MockCellular(
+ MockCellular* cellular = new MockCellular(
&modem_info_,
kLinkName,
kAddressAsString,
@@ -212,7 +212,7 @@
base::StringPrintf(Modem::kFakeDevNameFormat, Modem::fake_dev_serial_));
// |modem_| will take ownership.
- MockCellular *cellular = new MockCellular(
+ MockCellular* cellular = new MockCellular(
&modem_info_,
dev_name,
Modem::kFakeDevAddress,