NOT FOR REVIEW

components/wifi_sync/wifi_credential_syncable_service_factory.cc

 // Copyright 2014 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.
 
 #include "components/wifi_sync/wifi_credential_syncable_service_factory.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/wifi_sync/wifi_config_delegate.h"
 #include "components/wifi_sync/wifi_credential_syncable_service_impl.h"
 #include "content/public/browser/browser_context.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/files/file_path.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/network_handler.h"
 #include "components/wifi_sync/wifi_config_delegate_chromeos.h"
+#include "components/wifi_sync/wifi_config_observer_chromeos.h"
 #endif
 
 namespace wifi_sync {
 
 namespace {
 
 #if defined(OS_CHROMEOS)
 // Returns a string identifying a ChromeOS network settings profile,
 // by that profile's UserHash property. This value may be communicated
 // to the ChromeOS connection manager ("Shill"), but must not be
@@ skipping 42 matching lines @@
 
 WifiCredentialSyncableServiceFactory::~WifiCredentialSyncableServiceFactory() {
 }
 
 KeyedService* WifiCredentialSyncableServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   // TODO(quiche): Figure out if this behaves properly for multi-profile.
   // crbug.com/430681.
 #if defined(OS_CHROMEOS)
   return new WifiCredentialSyncableServiceImpl(
-      BuildWifiConfigDelegateChromeOs(context));
+      BuildWifiConfigDelegateChromeOs(context),
+      BuildWifiConfigObserverChromeOs(context));
 #else
   NOTREACHED();
   return nullptr;
 #endif
 }
 
 #if defined(OS_CHROMEOS)
 scoped_ptr<WifiConfigDelegate>
 WifiCredentialSyncableServiceFactory::BuildWifiConfigDelegateChromeOs(
     content::BrowserContext* context) const {
   // Note: NetworkHandler is a singleton that is managed by
   // ChromeBrowserMainPartsChromeos, and destroyed after all
   // KeyedService instances are destroyed.
   chromeos::NetworkHandler* network_handler = chromeos::NetworkHandler::Get();
   return make_scoped_ptr(new WifiConfigDelegateChromeOs(
       GetUserHash(context, !ignore_login_state_for_test_),
       network_handler->managed_network_configuration_handler()));
 }
+
+scoped_ptr<WifiConfigObserver>
+WifiCredentialSyncableServiceFactory::BuildWifiConfigObserverChromeOs(
+    content::BrowserContext* context) const {
+  // Note: NetworkHandler is a singleton that is managed by
+  // ChromeBrowserMainPartsChromeos, and destroyed after all
+  // KeyedService instances are destroyed.
+  chromeos::NetworkHandler* network_handler = chromeos::NetworkHandler::Get();
+  return make_scoped_ptr(new WifiConfigObserverChromeOs(
+      GetUserHash(context, !ignore_login_state_for_test_),  // XXX
+      network_handler->managed_network_configuration_handler(),
+      network_handler->network_configuration_handler(),
+      network_handler->network_state_handler()));
+}
 #endif
 
 }  // namespace wifi_sync