Revert 99169 - Delay the metrics policy migration call to make sure ownership has been taken.

chrome/browser/chromeos/login/existing_user_controller.cc

 // Copyright (c) 2011 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/existing_user_controller.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
@@ skipping 232 matching lines @@
 
 void ExistingUserController::OnStartEnterpriseEnrollment() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEnableDevicePolicy)) {
     ownership_checker_.reset(new OwnershipStatusChecker(NewCallback(
         this, &ExistingUserController::OnEnrollmentOwnershipCheckCompleted)));
   }
 }
 
 void ExistingUserController::OnEnrollmentOwnershipCheckCompleted(
-    OwnershipService::Status status,
-    bool current_user_is_owner) {
+    OwnershipService::Status status) {
   if (status == OwnershipService::OWNERSHIP_NONE) {
     host_->StartWizard(WizardController::kEnterpriseEnrollmentScreenName,
                        GURL());
     login_display_->OnFadeOut();
   }
   ownership_checker_.reset();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ExistingUserController, LoginPerformer::Delegate implementation:
@@ skipping 296 matching lines @@
   }
   if (CrosLibrary::Get()->EnsureLoaded()) {
     CryptohomeLibrary* cryptohomed = CrosLibrary::Get()->GetCryptohomeLibrary();
     cryptohomed->AsyncSetOwnerUser(
         UserCrosSettingsProvider::cached_owner(), NULL);
     cryptohomed->AsyncDoAutomaticFreeDiskSpaceControl(NULL);
   }
 }
 
 }  // namespace chromeos