Cleanup in policy code, removed some dead code.

chrome/browser/policy/cros_user_policy_cache.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/cros_user_policy_cache.h"
 
-#include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/file_path.h"
 #include "base/file_util.h"
 #include "chrome/browser/policy/proto/cloud_policy.pb.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 #include "chrome/browser/policy/proto/device_management_local.pb.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace em = enterprise_management;
@@ skipping 43 matching lines @@
     chromeos::SessionManagerClient* session_manager_client,
     const StatusCallback& callback)
     : policy_(policy),
       session_manager_client_(session_manager_client),
       callback_(callback) {}
 
 void CrosUserPolicyCache::StorePolicyOperation::Run() {
   std::string serialized;
   if (!policy_.SerializeToString(&serialized)) {
     LOG(ERROR) << "Failed to serialize policy protobuf!";
-    callback_.Run(false);
+    if (!callback_.is_null())
+      callback_.Run(false);
     delete this;
+    return;
   }
   session_manager_client_->StoreUserPolicy(
       serialized,
       base::Bind(&CrosUserPolicyCache::StorePolicyOperation::OnPolicyStored,
                  base::Unretained(this)));
 }
 
 void CrosUserPolicyCache::StorePolicyOperation::Cancel() {
   callback_.Reset();
 }
@@ skipping 317 matching lines @@
     set_last_policy_refresh_time(timestamp);
 }
 
 // static
 void CrosUserPolicyCache::RemoveLegacyCacheDir(const FilePath& dir) {
   if (!file_util::Delete(dir, true))
     PLOG(ERROR) << "Failed to remove " << dir.value();
 }
 
 }  // namespace policy