cryptohome: Move stateless wrapper functions out of CryptohomeLibrary

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 <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
@@ skipping 50 matching lines @@
 #include "chrome/browser/chromeos/policy/device_status_collector.h"
 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
 #include "chrome/browser/chromeos/policy/network_configuration_updater.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 "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/cryptohome/cryptohome_library.h"

[pneubeck (no reviews), 2013/09/27 08:59:25]

unused after the removal below

 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
 #endif
 
 using content::BrowserThread;
 
 namespace policy {
 
@@ skipping 43 matching lines @@
       weak_ptr_factory_(this) {
   // GetPolicyService() must be ready after the constructor is done.
   // 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());
 
 #if defined(OS_CHROMEOS)
   // CryptohomeLibrary or DBusThreadManager may be uninitialized on unit tests.
   if (chromeos::CryptohomeLibrary::IsInitialized() &&

[pneubeck (no reviews), 2013/09/27 08:59:25]

this shouldn't be required anymore (update the comment too please)

[satorux1, 2013/10/01 05:24:03]

This turned out to be necessary, as removing it will cause tests to fail (the
code inside the if-block will be run if CryptohomeLibrary::IsInitialized() is
removed). For now, let me add a TODO here.

[pneubeck (no reviews), 2013/10/01 09:05:08]

...how we love implicit dependencies...

       chromeos::DBusThreadManager::IsInitialized()) {
-    chromeos::CryptohomeLibrary* cryptohome =
-        chromeos::CryptohomeLibrary::Get();
     chromeos::CryptohomeClient* cryptohome_client =
         chromeos::DBusThreadManager::Get()->GetCryptohomeClient();
     install_attributes_.reset(
-        new EnterpriseInstallAttributes(cryptohome, cryptohome_client));
+        new EnterpriseInstallAttributes(cryptohome_client));
     base::FilePath install_attrs_file;
     CHECK(PathService::Get(chromeos::FILE_INSTALL_ATTRIBUTES,
                            &install_attrs_file));
     install_attributes_->ReadCacheFile(install_attrs_file);
 
     scoped_ptr<DeviceCloudPolicyStoreChromeOS> device_cloud_policy_store(
         new DeviceCloudPolicyStoreChromeOS(
             chromeos::DeviceSettingsService::Get(),
             install_attributes_.get()));
     device_cloud_policy_manager_.reset(
@@ skipping 344 matching lines @@
     return new AsyncPolicyProvider(loader.Pass());
   } else {
     return NULL;
   }
 #else
   return NULL;
 #endif
 }
 
 }  // namespace policy