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

chrome/browser/chromeos/login/owner_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_OWNER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_OWNER_MANAGER_H_
 #pragma once
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/crypto/rsa_private_key.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/chromeos/cros/login_library.h"
 #include "chrome/browser/chromeos/login/owner_key_utils.h"
 
 class FilePath;
 class NotificationDetails;
 class NotificationType;
 
 namespace chromeos {
 
 // This class allows the registration of an Owner of a Chromium OS device.
 // It handles generating the appropriate keys and storing them in the
 // appropriate locations.
-class OwnerManager : public base::RefCountedThreadSafe<OwnerManager>,
-                     public LoginLibrary::Delegate {
+class OwnerManager : public base::RefCountedThreadSafe<OwnerManager> {
  public:
   // Return codes for public/private key operations.
   enum KeyOpCode {
     SUCCESS,
     KEY_UNAVAILABLE,  // The necessary key isn't available yet.
     OPERATION_FAILED  // The crypto operation failed.
   };
 
   class Delegate {
    public:
     // Upon completion of a key operation, this method will be called.
     // |return_code| indicates what happened, |payload| will be used to pass
     // back any artifacts of the operation.  For example, if the operation
     // was a signature attempt, the signature blob would come back in |payload|.
     virtual void OnKeyOpComplete(const KeyOpCode return_code,
                                  const std::vector<uint8>& payload) = 0;
   };
 
   OwnerManager();
   virtual ~OwnerManager();
 
   // Pulls the owner's public key off disk and into memory.
   //
   // Call this on the FILE thread.
   void LoadOwnerKey();
 
-  // Generates the owner's keys in the default NSS token.  Also stores
-  // them in |public_key_| and |private_key_|.  When done, causes the
-  // public key to get exported via DBus.
-  //
-  // Call this on the FILE thread.
-  void GenerateKeysAndExportPublic();
-
-  // Exports |public_key_| via DBus.
-  //
-  // Call this on the UI thread (because of DBus usage).
-  void ExportKey();
-
-  // Overridden from LoginLibrary::Delegate
-  void OnComplete(bool value);
-
   bool EnsurePublicKey();
   bool EnsurePrivateKey();
 
   // Do the actual work of signing |data| with |private_key_|.  First,
   // ensures that we have the keys we need.  Then, computes the signature.
   //
   // On success, calls d->OnKeyOpComplete() on |thread_id| with a
   // successful return code, passing the signaure blob in |payload|.
   // On failure, calls d->OnKeyOpComplete() on |thread_id| with an appropriate
   // error and passes an empty string for |payload|.
@@ skipping 32 matching lines @@
   scoped_refptr<OwnerKeyUtils> utils_;
 
   friend class OwnerManagerTest;
 
   DISALLOW_COPY_AND_ASSIGN(OwnerManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_OWNER_MANAGER_H_