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

chrome/browser/chromeos/options/network_config_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_
 #pragma once
 
 #include <string>
 
@@ skipping 24 matching lines @@
     virtual void OnDialogAccepted() = 0;
 
     // Called when dialog "Cancel" button is pressed.
     virtual void OnDialogCancelled() = 0;
 
    protected:
      virtual ~Delegate() {}
   };
 
   // Configure dialog for ethernet.
-  explicit NetworkConfigView(EthernetNetwork ethernet);
+  explicit NetworkConfigView(const EthernetNetwork* ethernet);
   // Configure dialog for wifi. If |login_only|, then only show login tab.
-  explicit NetworkConfigView(WifiNetwork wifi, bool login_only);
+  explicit NetworkConfigView(const WifiNetwork* wifi, bool login_only);
   // Configure dialog for cellular.
-  explicit NetworkConfigView(CellularNetwork cellular);
+  explicit NetworkConfigView(const CellularNetwork* cellular);
   // Login dialog for hidden networks.
   explicit NetworkConfigView();
-  virtual ~NetworkConfigView() {}
+  virtual ~NetworkConfigView();
 
   // Returns corresponding native window.
   gfx::NativeWindow GetNativeWindow() const;
 
   // views::DialogDelegate methods.
   virtual std::wstring GetDialogButtonLabel(
       MessageBoxFlags::DialogButton button) const;
   virtual bool IsDialogButtonEnabled(
       MessageBoxFlags::DialogButton button) const;
   virtual bool Cancel();
@@ skipping 46 matching lines @@
   void Init();
 
   // True when opening in browser, otherwise in OOBE/login mode.
   bool browser_mode_;
 
   views::TabbedPane* tabs_;
 
   // NetworkConfigFlags to specify which UIs to show.
   int flags_;
 
-  EthernetNetwork ethernet_;
-  WifiNetwork wifi_;
-  CellularNetwork cellular_;
+  EthernetNetwork* ethernet_;
+  WifiNetwork* wifi_;
+  CellularNetwork* cellular_;
 
   CellularConfigView* cellularconfig_view_;
   WifiConfigView* wificonfig_view_;
   IPConfigView* ipconfig_view_;
 
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkConfigView);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_