| Index: chromeos/network/network_configuration_handler.h
|
| diff --git a/chromeos/network/network_configuration_handler.h b/chromeos/network/network_configuration_handler.h
|
| index 2a0098983eba1743fbaabc7f9d2d4a06a1b5e8b8..1f073b6bb582a36b78a68da4f5b50c0faf0cfd61 100644
|
| --- a/chromeos/network/network_configuration_handler.h
|
| +++ b/chromeos/network/network_configuration_handler.h
|
| @@ -12,6 +12,7 @@
|
| #include "base/callback.h"
|
| #include "base/gtest_prod_util.h"
|
| #include "chromeos/chromeos_export.h"
|
| +#include "chromeos/network/network_handler.h"
|
| #include "chromeos/network/network_handler_callbacks.h"
|
|
|
| namespace base {
|
| @@ -43,15 +44,6 @@ class CHROMEOS_EXPORT NetworkConfigurationHandler {
|
| public:
|
| ~NetworkConfigurationHandler();
|
|
|
| - // Sets the global instance. Must be called before any calls to Get().
|
| - static void Initialize();
|
| -
|
| - // Destroys the global instance.
|
| - static void Shutdown();
|
| -
|
| - // Gets the global instance. Initialize() must be called first.
|
| - static NetworkConfigurationHandler* Get();
|
| -
|
| // Gets the properties of the network with id |service_path|. See note on
|
| // |callback| and |error_callback|, in class description above.
|
| void GetProperties(
|
| @@ -110,7 +102,8 @@ class CHROMEOS_EXPORT NetworkConfigurationHandler {
|
| const base::Closure& callback,
|
| const network_handler::ErrorCallback& error_callback) const;
|
|
|
| - private:
|
| + protected:
|
| + friend class NetworkHandler;
|
| friend class NetworkConfigurationHandlerTest;
|
| NetworkConfigurationHandler();
|
|
|
|
|