Add a unified observer to replace NetworkManagerObserver

chrome/browser/chromeos/net/mock_connectivity_state_helper.h

Index: chrome/browser/chromeos/net/mock_connectivity_state_helper.h
diff --git a/chrome/browser/chromeos/net/mock_connectivity_state_helper.h b/chrome/browser/chromeos/net/mock_connectivity_state_helper.h
index 159f46d92a96cb324944615716b60a6a75cf1904..70a599f24450edc723bcfb064b6cca1e13654504 100644
--- a/chrome/browser/chromeos/net/mock_connectivity_state_helper.h
+++ b/chrome/browser/chromeos/net/mock_connectivity_state_helper.h
@@ -9,6 +9,7 @@
 
 #include <string>
 
+#include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -23,10 +24,13 @@ class MockConnectivityStateHelper : public ConnectivityStateHelper {
   MOCK_METHOD1(NetworkNameForType, std::string(const std::string&));
   MOCK_METHOD0(DefaultNetworkName, std::string(void));
   MOCK_METHOD0(DefaultNetworkOnline, bool(void));
+  MOCK_CONST_METHOD0(RequestScan, void(void));
+  MOCK_METHOD1(AddNetworkManagerObserver,
+               void(ConnectivityStateHelperObserver*));
+  MOCK_METHOD1(RemoveNetworkManagerObserver,
+               void(ConnectivityStateHelperObserver*));
 };
 
-
-
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_NET_MOCK_CONNECTIVITY_STATE_HELPER_H_