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

chrome/browser/chromeos/network_message_observer.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_NETWORK_MESSAGE_OBSERVER_H_
 #define CHROME_BROWSER_CHROMEOS_NETWORK_MESSAGE_OBSERVER_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 10 matching lines @@
 namespace chromeos {
 
 // The network message observer displays a system notification for network
 // messages.
 
 class NetworkMessageObserver : public NetworkLibrary::Observer {
  public:
   explicit NetworkMessageObserver(Profile* profile);
   virtual ~NetworkMessageObserver();
 
-  typedef std::map<std::string, WifiNetwork> ServicePathWifiMap;
-  typedef std::map<std::string, CellularNetwork> ServicePathCellularMap;
+  typedef std::map<std::string, WifiNetwork*> ServicePathWifiMap;
+  typedef std::map<std::string, CellularNetwork*> ServicePathCellularMap;
  private:
   virtual void CreateModalPopup(views::WindowDelegate* view);
   virtual void MobileSetup(const ListValue* args);
 
   // NetworkLibrary::Observer implementation.
   virtual void NetworkChanged(NetworkLibrary* obj);
   virtual void CellularDataPlanChanged(NetworkLibrary* obj);
 
   bool initialized_;
   // Wifi networks by service path.
@@ skipping 13 matching lines @@
   // Notification for showing no data warning
   SystemNotification notification_no_data_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkMessageObserver);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_NETWORK_MESSAGE_OBSERVER_H_