OwnerKeyUtil is moved to components/ownership.

chrome/browser/chromeos/ownership/owner_settings_service.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 "chrome/browser/chromeos/ownership/owner_settings_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
+#include "base/path_service.h"
+#include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/session_manager_operation.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chromeos/chromeos_paths.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/common/content_switches.h"
 #include "crypto/nss_util.h"
 #include "crypto/nss_util_internal.h"
 #include "crypto/rsa_private_key.h"
 #include "crypto/scoped_nss_types.h"
 #include "crypto/signature_creator.h"
 
 namespace em = enterprise_management;
 
 using content::BrowserThread;
+using ownership::OwnerKeyUtil;
+using ownership::PrivateKey;
+using ownership::PublicKey;
 
 namespace chromeos {
 
 namespace {
 
 scoped_refptr<OwnerKeyUtil>* g_owner_key_util_for_testing = NULL;
 DeviceSettingsService* g_device_settings_service_for_testing = NULL;
 
+scoped_refptr<ownership::OwnerKeyUtil> MakeOwnerKeyUtil() {
+  base::FilePath public_key_path;
+  if (!PathService::Get(chromeos::FILE_OWNER_KEY, &public_key_path))
+    return NULL;
+  return OwnerKeyUtil::Create(public_key_path);
+}

[stevenjb, 2014/08/26 16:02:12]

So, while I do like removing the reference to chromeos::FILE_KEY_OWNER from the
component, we now appear to have this copy/pasted several times in the Chrome
code. Could we perhaps make this public, or create a public helper method that
is used throughout the chrome code?

[ygorshenin1, 2014/08/26 16:31:16]

Done.

+
 bool IsOwnerInTests(const std::string& user_id) {
   if (user_id.empty() ||
       !CommandLine::ForCurrentProcess()->HasSwitch(::switches::kTestType) ||
       !CrosSettings::IsInitialized()) {
     return false;
   }
   const base::Value* value = CrosSettings::Get()->GetPref(kDeviceOwner);
   if (!value || value->GetType() != base::Value::TYPE_STRING)
     return false;
   return static_cast<const base::StringValue*>(value)->GetString() == user_id;
@@ skipping 117 matching lines @@
 }
 
 // Checks whether NSS slots with private key are mounted or
 // not. Responds via |callback|.
 void DoesPrivateKeyExistAsync(
     const OwnerSettingsService::IsOwnerCallback& callback) {
   scoped_refptr<OwnerKeyUtil> owner_key_util;
   if (g_owner_key_util_for_testing)
     owner_key_util = *g_owner_key_util_for_testing;
   else
-    owner_key_util = OwnerKeyUtil::Create();
+    owner_key_util = MakeOwnerKeyUtil();
+  if (!owner_key_util) {
+    callback.Run(false);
+    return;
+  }
   scoped_refptr<base::TaskRunner> task_runner =
       content::BrowserThread::GetBlockingPool()
           ->GetTaskRunnerWithShutdownBehavior(
               base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
   base::PostTaskAndReplyWithResult(
       task_runner.get(),
       FROM_HERE,
       base::Bind(&DoesPrivateKeyExistAsyncHelper, owner_key_util),
       callback);
 }
@@ skipping 35 matching lines @@
   }
 
   NOTREACHED();
   return false;
 }
 
 }  // namespace
 
 OwnerSettingsService::OwnerSettingsService(Profile* profile)
     : profile_(profile),
-      owner_key_util_(OwnerKeyUtil::Create()),
+      owner_key_util_(MakeOwnerKeyUtil()),
       waiting_for_profile_creation_(true),
       waiting_for_tpm_token_(true),
       weak_factory_(this) {
   if (TPMTokenLoader::IsInitialized()) {
     waiting_for_tpm_token_ = !TPMTokenLoader::Get()->IsTPMTokenReady();
     TPMTokenLoader::Get()->AddObserver(this);
   }
 
   if (DBusThreadManager::IsInitialized() &&
       DBusThreadManager::Get()->GetSessionManagerClient()) {
@@ skipping 274 matching lines @@
 DeviceSettingsService* OwnerSettingsService::GetDeviceSettingsService() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (g_device_settings_service_for_testing)
     return g_device_settings_service_for_testing;
   if (DeviceSettingsService::IsInitialized())
     return DeviceSettingsService::Get();
   return NULL;
 }
 
 }  // namespace chromeos