Add NetworkStateHandler::RequestUpdateForNetwork

This also changes the code to signal observers after update requests,
even if nothing changed so that NetworkPropertiesUpdated() will get
signaled after a request.

BUG=240728
R=pneubeck@chromium.org

Review URL: https://codereview.chromium.org/15233002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201614 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 15 insertions, 0 deletions

diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index c453eb7..fcc60d8 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -376,6 +376,9 @@ void Network::SetValueProperty(const char* prop, const base::Value& value) {
   if (!EnsureCrosLoaded())
     return;
   CrosSetNetworkServiceProperty(service_path_, prop, value);
+  // Ensure NetworkStateHandler properties are up-to-date.
+  if (NetworkStateHandler::IsInitialized())
+    NetworkStateHandler::Get()->RequestUpdateForNetwork(service_path());
 }
 
 void Network::ClearProperty(const char* prop) {
@@ -383,6 +386,9 @@ void Network::ClearProperty(const char* prop) {
   if (!EnsureCrosLoaded())
     return;
   CrosClearNetworkServiceProperty(service_path_, prop);
+  // Ensure NetworkStateHandler properties are up-to-date.
+  if (NetworkStateHandler::IsInitialized())
+    NetworkStateHandler::Get()->RequestUpdateForNetwork(service_path());
 }
 
 void Network::SetStringProperty(
diff --git a/chrome/browser/chromeos/cros/network_library_impl_base.cc b/chrome/browser/chromeos/cros/network_library_impl_base.cc
index 7baeddb..0158976 100644
--- a/chrome/browser/chromeos/cros/network_library_impl_base.cc
+++ b/chrome/browser/chromeos/cros/network_library_impl_base.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/net/onc_utils.h"
 #include "chrome/browser/chromeos/network_login_observer.h"
+#include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/onc/onc_constants.h"
 #include "chromeos/network/onc/onc_normalizer.h"
@@ -1202,6 +1203,9 @@ void NetworkLibraryImplBase::LoadOncNetworks(
   } else if (source == onc::ONC_SOURCE_USER_IMPORT && !removal_ids.empty()) {
     ForgetNetworksById(source, removal_ids, true);
   }
+  // Ensure NetworkStateHandler properties are up-to-date.
+  if (NetworkStateHandler::IsInitialized())
+    NetworkStateHandler::Get()->RequestUpdateForAllNetworks();
 }
 
 ////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/chromeos/cros/network_library_impl_cros.cc b/chrome/browser/chromeos/cros/network_library_impl_cros.cc
index 41d1b73..8691af6 100644
--- a/chrome/browser/chromeos/cros/network_library_impl_cros.cc
+++ b/chrome/browser/chromeos/cros/network_library_impl_cros.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/network/cros_network_functions.h"
+#include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
@@ -1353,6 +1354,10 @@ void NetworkLibraryImplCros::SetIPParametersCallback(
   if (!something_changed)
     return;
 
+  // Ensure NetworkStateHandler properties are up-to-date.
+  if (NetworkStateHandler::IsInitialized())
+    NetworkStateHandler::Get()->RequestUpdateForNetwork(service_path);
+
   // Attempt to refresh its IP parameters, so that the changes to the service
   // properties can take effect.
   if (network->connecting_or_connected())