Move cryptohome_library to src/chromeos

chrome/browser/policy/browser_policy_connector.cc

 // Copyright (c) 2012 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 "chrome/browser/policy/browser_policy_connector.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 49 matching lines @@
 #include "chrome/browser/chromeos/policy/network_configuration_updater.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_provider.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/policy/cloud/resource_cache.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/cryptohome/cryptohome_library.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #else
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 #endif
 
 using content::BrowserThread;
 
 namespace policy {
@@ skipping 38 matching lines @@
   // The connector is created very early during startup, when the browser
   // threads aren't running yet; initialize components that need local_state,
   // the system request context or other threads (e.g. FILE) at Init().
 
   platform_provider_.reset(CreatePlatformProvider());
 
   device_management_service_.reset(
       new DeviceManagementService(GetDeviceManagementUrl()));
 
 #if defined(OS_CHROMEOS)
-  chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get();
-  // |cros_library| may be NULL on unit tests. DBusThreadManager may not be
-  // initialized on unit tests..
-  if (cros_library && chromeos::DBusThreadManager::IsInitialized()) {
+  // CryptohomeLibrary or DBusThreadManager may be uninitialized on unit tests.
+  if (chromeos::CryptohomeLibrary::IsInitialized() &&
+      chromeos::DBusThreadManager::IsInitialized()) {
     chromeos::CryptohomeLibrary* cryptohome =
-        cros_library->GetCryptohomeLibrary();
+        chromeos::CryptohomeLibrary::Get();
     chromeos::CryptohomeClient* cryptohome_client =
         chromeos::DBusThreadManager::Get()->GetCryptohomeClient();
     install_attributes_.reset(
         new EnterpriseInstallAttributes(cryptohome, cryptohome_client));
     base::FilePath install_attrs_file;
     CHECK(PathService::Get(chrome::FILE_INSTALL_ATTRIBUTES,
                            &install_attrs_file));
     install_attributes_->ReadCacheFile(install_attrs_file);
 
     scoped_ptr<DeviceCloudPolicyStoreChromeOS> device_cloud_policy_store(
@@ skipping 438 matching lines @@
     return new AsyncPolicyProvider(loader.Pass());
   } else {
     return NULL;
   }
 #else
   return NULL;
 #endif
 }
 
 }  // namespace policy