Rewritten parts of NetworkLibrary to work around memory corruption that prev...

chrome/browser/chromeos/options/cellular_config_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/options/cellular_config_view.h"
 
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 22 matching lines @@
 
   int64 purchased_data;
   base::TimeDelta purchased_time;
 
   int64 remaining_data;
   base::TimeDelta remaining_time;
 };
 
 // TODO(xiyuan): Get real data from libcros when it's ready.
 // Get plan details at the time being called.
-void GetPlanDetails(const chromeos::CellularNetwork& cellular,
+void GetPlanDetails(const chromeos::CellularNetwork* cellular,
                     PlanDetails* details) {
   // Free 5M 30day plan.
   details->last_purchase_type = UNKNOWN;
   details->last_purchase_time = base::Time::Now();
   details->purchased_data = 5 * 1024 * 1024;
   details->purchased_time = base::TimeDelta::FromDays(30);
   details->remaining_data = 2 * 1024 * 1024;
   details->remaining_time = base::TimeDelta::FromDays(29);
 }
 
 }  // namespace
 
 namespace chromeos {
 
 CellularConfigView::CellularConfigView(NetworkConfigView* parent,
-                                       const CellularNetwork& cellular)
+                                       const CellularNetwork* cellular)
     : parent_(parent),
-      cellular_(cellular),
+      cellular_(new CellularNetwork(*cellular)),
       purchase_info_(NULL),
       purchase_more_button_(NULL),
       remaining_data_info_(NULL),
       expiration_info_(NULL),
       show_notification_checkbox_(NULL),
       autoconnect_checkbox_(NULL),
       customer_support_link_(NULL) {
   Init();
 }
 
+CellularConfigView::~CellularConfigView() {
+}
+
 void CellularConfigView::ButtonPressed(views::Button* button,
     const views::Event& event) {
   if (button == purchase_more_button_) {
     // TODO(xiyuan): Purchase more...
   }
 }
 
 void CellularConfigView::LinkActivated(views::Link* source, int event_flags) {
   if (source == customer_support_link_) {
     // TODO(xiyuan): Find out where to go.
   }
 }
 
 bool CellularConfigView::Save() {
   // Save auto-connect here.
   bool auto_connect = autoconnect_checkbox_->checked();
-  if (auto_connect != cellular_.auto_connect()) {
-    cellular_.set_auto_connect(auto_connect);
-    CrosLibrary::Get()->GetNetworkLibrary()->SaveCellularNetwork(cellular_);
+  if (auto_connect != cellular_->auto_connect()) {
+    cellular_->set_auto_connect(auto_connect);
+    CrosLibrary::Get()->GetNetworkLibrary()->SaveCellularNetwork(
+        cellular_.get());
   }
   return true;
 }
 
 void CellularConfigView::Init() {
   views::GridLayout* layout = CreatePanelGridLayout(this);
   SetLayoutManager(layout);
 
   purchase_info_ = new views::Label();
   purchase_more_button_ = new views::NativeButton(this, l10n_util::GetString(
@@ skipping 49 matching lines @@
 
   layout->StartRow(0, kColumnSetId);
   layout->AddView(customer_support_link_, 3, 1,
       views::GridLayout::LEADING, views::GridLayout::TRAILING);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   Update();
 }
 
 void CellularConfigView::Update() {
-  autoconnect_checkbox_->SetChecked(cellular_.auto_connect());
+  autoconnect_checkbox_->SetChecked(cellular_->auto_connect());
 
   PlanDetails details;
-  GetPlanDetails(cellular_, &details);
+  GetPlanDetails(cellular_.get(), &details);
 
   switch (details.last_purchase_type) {
     case NO_PURCHASE:
       purchase_info_->SetText(l10n_util::GetStringF(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_RECEIVED_FREE_DATA,
           UTF16ToWide(FormatBytes(details.purchased_data,
                       GetByteDisplayUnits(details.purchased_data),
                       true)),
           base::TimeFormatFriendlyDate(details.last_purchase_time)));
       remaining_data_info_->SetText(
@@ skipping 40 matching lines @@
     }
     default:
       NOTREACHED() << "Unknown mobile plan purchase type.";
       break;
   }
 
   Layout();
 }
 
 }  // namespace chromeos