commit ec77f591237b5e0e2b05f67ae8dd4b25c08de6cb
author Roshan Pius <rpius@chromium.org> Wed Oct 29 15:07:38 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Oct 31 00:56:17 2014 +0000
tree a4d3328077753aec6e1ac72e77ffc253235a57c3
parent 22ce765226cfdcf267b7dc80c22892e6b29065ea

shill: cellular: Update properties to remove Cellular::Operator usage.

BUG=chromium:428391
TEST=FEATURE="test" emerge-${BOARD} shill

Change-Id: I4fa52c96e7332818f3d5cf5d8c154b986d22278f
Reviewed-on: https://chromium-review.googlesource.com/226354
Reviewed-by: Thieu Le <thieule@chromium.org>
Tested-by: Roshan Pius <rpius@chromium.org>
Commit-Queue: Roshan Pius <rpius@chromium.org>

cellular_capability_gsm_unittest.cc

diff --git a/cellular_capability_gsm_unittest.cc b/cellular_capability_gsm_unittest.cc
index c931297..88da97a 100644
--- a/cellular_capability_gsm_unittest.cc
+++ b/cellular_capability_gsm_unittest.cc
@@ -248,14 +248,13 @@
     service->SetStorageIdentifier(kStorageIdentifier);
     service->SetFriendlyName(kFriendlyServiceName);
 
-    Cellular::Operator oper;
-    oper.SetCode(kOperatorCode);
-    oper.SetName(kOperatorName);
-    oper.SetCountry(kOperatorCountry);
+    Stringmap serving_operator;
+    serving_operator[kOperatorCodeKey] = kOperatorCode;
+    serving_operator[kOperatorNameKey] = kOperatorName;
+    serving_operator[kOperatorCountryKey] = kOperatorCountry;
 
-    service->SetServingOperator(oper);
-
-    cellular_->set_home_provider(oper);
+    service->set_serving_operator(serving_operator);
+    cellular_->set_home_provider(serving_operator);
     cellular_->service_ = service;
   }