summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-08 20:19:45 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-08 20:19:45 +0000
commit93a73823d4f473e97cb345a210dd9f9c9b958f1c (patch)
tree454f9f543692ba95e6345e8d0dd2f5392739fc08
parent6d4b1a964e2d66e783a9798e110c54bc0c8f2f70 (diff)
downloadchromium_src-93a73823d4f473e97cb345a210dd9f9c9b958f1c.zip
chromium_src-93a73823d4f473e97cb345a210dd9f9c9b958f1c.tar.gz
chromium_src-93a73823d4f473e97cb345a210dd9f9c9b958f1c.tar.bz2
Merge 65405 - Fixed crash related to cellular network payment plan retreival.
BUG=chromium-os:8864 TEST=none Review URL: http://codereview.chromium.org/4690002 TBR=zelidrag@chromium.org Review URL: http://codereview.chromium.org/4712001 git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@65411 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/cros/network_library.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index 57bab2a..a12d537 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -1406,13 +1406,10 @@ class NetworkLibraryImpl : public NetworkLibrary {
for (size_t i = 0; i < cellular_networks_.size(); i++) {
if (cellular_networks_[i]->connecting_or_connected()) {
cellular_ = cellular_networks_[i];
- // If new cellular, then update data plan list.
+ // If new cellular, then request update of the data plan list.
if (cellular_networks_[i]->service_path() !=
prev_cellular_service_path) {
- CellularDataPlanList* list = RetrieveCellularDataPlans(
- cellular_->service_path().c_str());
- UpdateCellularDataPlan(list);
- FreeCellularDataPlanList(list);
+ RefreshCellularDataPlans(cellular_);
}
break; // There is only one connected or connecting cellular network.
}