Make sure the device recovers from policy loss in the consumer case.

chrome/browser/chromeos/dbus/cryptohome_client.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/chromeos/dbus/cryptohome_client.h"
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 81 matching lines @@
     async_call_status_handler_.Reset();
   }
 
   // CryptohomeClient override.
   virtual bool IsMounted(bool* is_mounted) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeIsMounted);
     return CallMethodAndBlock(&method_call, base::Bind(&PopBool, is_mounted));
   }
 
   // CryptohomeClient override.
+  virtual bool Unmount(bool *success) OVERRIDE {
+    INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeUnmount);
+    return CallMethodAndBlock(&method_call, base::Bind(&PopBool, success));
+  }
+
+  // CryptohomeClient override.
   virtual void AsyncCheckKey(const std::string& username,
                              const std::string& key,
                              AsyncMethodCallback callback) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeAsyncCheckKey);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(username);
     writer.AppendString(key);
     proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                        base::Bind(&CryptohomeClientImpl::OnAsyncMethodCall,
                                   weak_ptr_factory_.GetWeakPtr(),
@@ skipping 346 matching lines @@
     async_call_status_handler_.Reset();
   }
 
   // CryptohomeClient override.
   virtual bool IsMounted(bool* is_mounted) OVERRIDE {
     *is_mounted = true;
     return true;
   }
 
   // CryptohomeClient override.
+  virtual bool Unmount(bool* success) OVERRIDE {
+    *success = true;
+    return true;
+  }
+
+  // CryptohomeClient override.
   virtual void AsyncCheckKey(const std::string& username,
                              const std::string& key,
                              AsyncMethodCallback callback) OVERRIDE {
     ReturnAsyncMethodResult(callback);
   }
 
   // CryptohomeClient override.
   virtual void AsyncMigrateKey(const std::string& username,
                                const std::string& from_key,
                                const std::string& to_key,
@@ skipping 178 matching lines @@
 
 // static
 CryptohomeClient* CryptohomeClient::Create(dbus::Bus* bus) {
   if (base::chromeos::IsRunningOnChromeOS())
     return new CryptohomeClientImpl(bus);
   else
     return new CryptohomeClientStubImpl();
 }
 
 }  // namespace chromeos