Revert 64888 - Push for ers:...

chrome/browser/chromeos/cros/mock_network_library.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_CROS_MOCK_NETWORK_LIBRARY_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_MOCK_NETWORK_LIBRARY_H_
 #pragma once
 
 #include <string>
 
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
 
 class MockNetworkLibrary : public NetworkLibrary {
  public:
   MockNetworkLibrary() {}
   virtual ~MockNetworkLibrary() {}
-  MOCK_METHOD1(AddNetworkManagerObserver, void(NetworkManagerObserver*));
-  MOCK_METHOD1(RemoveNetworkManagerObserver, void(NetworkManagerObserver*));
-  MOCK_METHOD2(AddNetworkObserver, void(const char*, NetworkObserver*));
-  MOCK_METHOD1(RemoveNetworkObserver, void(NetworkObserver*));
-  MOCK_METHOD1(AddCellularDataPlanObserver, void(NetworkManagerObserver*));
-  MOCK_METHOD1(RemoveCellularDataPlanObserver, void(NetworkManagerObserver*));
+  MOCK_METHOD1(AddObserver, void(Observer*));
+  MOCK_METHOD1(RemoveObserver, void(Observer*));
+  MOCK_METHOD2(AddProperyObserver, void(const char*, PropertyObserver*));
+  MOCK_METHOD1(RemoveProperyObserver, void(PropertyObserver*));
   MOCK_METHOD0(ethernet_network, EthernetNetwork*(void));
   MOCK_CONST_METHOD0(ethernet_connecting, bool(void));
   MOCK_CONST_METHOD0(ethernet_connected, bool(void));
   MOCK_METHOD0(wifi_network, WifiNetwork*(void));
   MOCK_CONST_METHOD0(wifi_connecting, bool(void));
   MOCK_CONST_METHOD0(wifi_connected, bool(void));
 
   MOCK_METHOD0(cellular_network, CellularNetwork*(void));
   MOCK_CONST_METHOD0(cellular_connecting, bool(void));
   MOCK_CONST_METHOD0(cellular_connected, bool(void));
@@ skipping 45 matching lines @@
   MOCK_METHOD1(EnableCellularNetworkDevice, void(bool));
   MOCK_METHOD1(EnableOfflineMode, void(bool));
   MOCK_METHOD2(GetIPConfigs, NetworkIPConfigVector(const std::string&,
                                                    std::string*));
   MOCK_METHOD1(GetHtmlInfo, std::string(int));
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_MOCK_NETWORK_LIBRARY_H_