[Chrome OS] Owner keys are generated outside Chrome now; handle appropriately

chrome/browser/chromeos/login/ownership_service.cc

 // Copyright (c) 2010 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/login/ownership_service.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "chrome/browser/browser_thread.h"
@@ skipping 19 matching lines @@
 bool OwnershipService::IsAlreadyOwned() {
   return file_util::PathExists(utils_->GetOwnerKeyFilePath());
 }
 
 void OwnershipService::StartLoadOwnerKeyAttempt() {
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableFunction(&TryLoadOwnerKeyAttempt, this));
 }
 
-void OwnershipService::StartTakeOwnershipAttempt(const std::string& unused) {
-  BrowserThread::PostTask(
-      BrowserThread::FILE, FROM_HERE,
-      NewRunnableFunction(&OwnershipService::TryTakeOwnershipAttempt, this));
-}
-
 void OwnershipService::StartSigningAttempt(const std::string& data,
                                            OwnerManager::Delegate* d) {
   BrowserThread::ID thread_id;
   if (!BrowserThread::GetCurrentThreadIdentifier(&thread_id))
     thread_id = BrowserThread::UI;
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableFunction(&OwnershipService::TrySigningAttempt,
                           this,
                           thread_id,
@@ skipping 29 matching lines @@
 void OwnershipService::TryLoadOwnerKeyAttempt(OwnershipService* service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   if (!service->IsAlreadyOwned()) {
     VLOG(1) << "Device not yet owned";
     return;
   }
   service->manager()->LoadOwnerKey();
 }
 
 // static
-void OwnershipService::TryTakeOwnershipAttempt(OwnershipService* service) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  if (service->IsAlreadyOwned()) {
-    VLOG(1) << "Device is already owned";
-    return;
-  }
-  service->manager()->GenerateKeysAndExportPublic();
-}
-
-// static
 void OwnershipService::TrySigningAttempt(OwnershipService* service,
                                          const BrowserThread::ID thread_id,
                                          const std::string& data,
                                          OwnerManager::Delegate* d) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   if (!service->IsAlreadyOwned()) {
     LOG(ERROR) << "Device not yet owned";
     BrowserThread::PostTask(
         thread_id, FROM_HERE,
         NewRunnableFunction(&OwnershipService::FailAttempt, d));
@@ skipping 18 matching lines @@
   }
   service->manager()->Verify(thread_id, data, signature, d);
 }
 
 // static
 void OwnershipService::FailAttempt(OwnerManager::Delegate* d) {
   d->OnKeyOpComplete(OwnerManager::KEY_UNAVAILABLE, std::vector<uint8>());
 }
 
 }  // namespace chromeos