Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1007)

Unified Diff: components/wifi_sync/wifi_credential_syncable_service_factory.cc

Issue 2463463004: [Sync] Rename wifi_sync to sync_wifi. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/wifi_sync/wifi_credential_syncable_service_factory.cc
diff --git a/components/wifi_sync/wifi_credential_syncable_service_factory.cc b/components/wifi_sync/wifi_credential_syncable_service_factory.cc
deleted file mode 100644
index efd8a25269a145d3a20f54764894776c487f3bbb..0000000000000000000000000000000000000000
--- a/components/wifi_sync/wifi_credential_syncable_service_factory.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-// 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/ptr_util.h"
-#include "build/build_config.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.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"
-#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
-// exposed to any untrusted code (e.g., via web APIs).
-std::string GetUserHash(content::BrowserContext* context,
- bool use_login_state) {
- if (use_login_state) {
- const chromeos::LoginState* login_state = chromeos::LoginState::Get();
- DCHECK(login_state->IsUserLoggedIn());
- DCHECK(!login_state->primary_user_hash().empty());
- // TODO(quiche): Verify that |context| is the primary user's context.
- return login_state->primary_user_hash();
- } else {
- // In WiFi credential sync tests, LoginState is not
- // available. Instead, those tests set their Shill profiles'
- // UserHashes based on the corresponding BrowserContexts' storage
- // paths.
- return context->GetPath().BaseName().value();
- }
-}
-#endif
-
-} // namespace
-
-// static
-WifiCredentialSyncableService*
-WifiCredentialSyncableServiceFactory::GetForBrowserContext(
- content::BrowserContext* browser_context) {
- return static_cast<WifiCredentialSyncableService*>(
- GetInstance()->GetServiceForBrowserContext(browser_context, true));
-}
-
-// static
-WifiCredentialSyncableServiceFactory*
-WifiCredentialSyncableServiceFactory::GetInstance() {
- return base::Singleton<WifiCredentialSyncableServiceFactory>::get();
-}
-
-// Private methods.
-
-WifiCredentialSyncableServiceFactory::WifiCredentialSyncableServiceFactory()
- : BrowserContextKeyedServiceFactory(
- "WifiCredentialSyncableService",
- BrowserContextDependencyManager::GetInstance()) {
-}
-
-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 WifiCredentialSyncableService(
- BuildWifiConfigDelegateChromeOs(context));
-#else
- NOTREACHED();
- return nullptr;
-#endif
-}
-
-#if defined(OS_CHROMEOS)
-std::unique_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 base::MakeUnique<WifiConfigDelegateChromeOs>(
- GetUserHash(context, !ignore_login_state_for_test_),
- network_handler->managed_network_configuration_handler());
-}
-#endif
-
-} // namespace wifi_sync

Powered by Google App Engine
This is Rietveld 408576698