commit 99ec94d3ef0049e5013e590017e8714b5fc9c682
author Prathmesh Prabhu <pprabhu@chromium.org> Fri Nov 22 10:43:37 2013 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat Nov 23 09:30:55 2013 +0000
tree f7d3e5fbd618084e9ef6fe1f1a92ad2eec78eec7
parent 074cdc7ffe3605147d6da3f5c7a960e53c8e5773

cellular: Rename home_provider_ in Capabilities to home_provider_info_

There is property home_provider_ in the Cellular object that is derived from the
home_provider_ in capabilities. Giving the same name to these two entities is
confusing.

BUG=chromium:322602
TEST=Run unit-tests, network_3GModemControl on daisy_spring.

Change-Id: Iba5414b52108a9f4d0bae3801d9e155ec1454f7a
Reviewed-on: https://chromium-review.googlesource.com/177772
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Commit-Queue: Prathmesh Prabhu <pprabhu@chromium.org>

cellular_capability_gsm_unittest.cc

diff --git a/cellular_capability_gsm_unittest.cc b/cellular_capability_gsm_unittest.cc
index f0a2d9d..2b1e7d4 100644
--- a/cellular_capability_gsm_unittest.cc
+++ b/cellular_capability_gsm_unittest.cc
@@ -660,7 +660,7 @@
   static const char kCode[] = "310160";
   capability_->imsi_ = "310240123456789";
 
-  EXPECT_FALSE(capability_->home_provider_);
+  EXPECT_FALSE(capability_->home_provider_info_);
   EXPECT_FALSE(capability_->provider_requires_roaming_);
 
   capability_->SetHomeProvider();  // No mobile provider DB available.
@@ -675,7 +675,7 @@
   EXPECT_EQ(kCountry, cellular_->home_provider().GetCountry());
   EXPECT_EQ(kCode, cellular_->home_provider().GetCode());
   EXPECT_EQ(4, capability_->apn_list_.size());
-  ASSERT_TRUE(capability_->home_provider_);
+  ASSERT_TRUE(capability_->home_provider_info_);
   EXPECT_FALSE(capability_->provider_requires_roaming_);
 
   Cellular::Operator oper;
@@ -692,16 +692,16 @@
   capability_->SetHomeProvider();
   EXPECT_EQ(kCubic, cellular_->home_provider().GetName());
   EXPECT_EQ("", cellular_->home_provider().GetCode());
-  ASSERT_TRUE(capability_->home_provider_);
+  ASSERT_TRUE(capability_->home_provider_info_);
   EXPECT_TRUE(capability_->provider_requires_roaming_);
 
   static const char kCUBIC[] = "CUBIC";
   capability_->spn_ = kCUBIC;
-  capability_->home_provider_ = NULL;
+  capability_->home_provider_info_ = NULL;
   capability_->SetHomeProvider();
   EXPECT_EQ(kCUBIC, cellular_->home_provider().GetName());
   EXPECT_EQ("", cellular_->home_provider().GetCode());
-  ASSERT_TRUE(capability_->home_provider_);
+  ASSERT_TRUE(capability_->home_provider_info_);
   EXPECT_TRUE(capability_->provider_requires_roaming_);
 }
 
@@ -715,9 +715,9 @@
 
 TEST_F(CellularCapabilityGSMTest, InitAPNList) {
   InitProviderDB();
-  capability_->home_provider_ =
+  capability_->home_provider_info_ =
       mobile_provider_lookup_by_name(modem_info_.provider_db(), "T-Mobile");
-  ASSERT_TRUE(capability_->home_provider_);
+  ASSERT_TRUE(capability_->home_provider_info_);
   EXPECT_EQ(0, capability_->apn_list_.size());
   EXPECT_CALL(*device_adaptor_,
               EmitStringmapsChanged(kCellularApnListProperty, SizeIs4()));