Remove managed user registration timeout.

chrome/browser/ui/webui/options/browser_options_handler.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/ui/webui/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 1165 matching lines @@
       Profile::FromWebUI(web_ui()),
       managed_user_id,
       callback);
 }
 
 void BrowserOptionsHandler::RecordProfileCreationMetrics(
     Profile::CreateStatus status) {
   UMA_HISTOGRAM_ENUMERATION("Profile.CreateResult",
                             status,
                             Profile::MAX_CREATE_STATUS);
-  UMA_HISTOGRAM_CUSTOM_TIMES("Profile.CreateTime",
-      base::TimeTicks::Now() - profile_creation_start_time_,
-      base::TimeDelta::FromMilliseconds(1),
-      base::TimeDelta::FromSeconds(30),  // From kRegistrationTimeoutMS.
-      100);
+  UMA_HISTOGRAM_MEDIUM_TIMES(
+      "Profile.CreateTimeNoTimeout",
+      base::TimeTicks::Now() - profile_creation_start_time_);
 }
 
 void BrowserOptionsHandler::ShowProfileCreationFeedback(
     chrome::HostDesktopType desktop_type,
     bool is_managed,
     Profile* profile,
     Profile::CreateStatus status) {
   DCHECK(profile_path_being_created_ == profile->GetPath());
   if (status != Profile::CREATE_STATUS_CREATED)
     RecordProfileCreationMetrics(status);
@@ skipping 90 matching lines @@
   if (!new_profile)
     return;
 
   // Non-managed user creation cannot be canceled. (Creating a non-managed
   // profile shouldn't take significant time, and it can easily be deleted
   // afterward.)
   if (!new_profile->IsManaged())
     return;
 
   if (user_initiated) {
-    UMA_HISTOGRAM_CUSTOM_TIMES("Profile.CreateTimeCanceled",
-      base::TimeTicks::Now() - profile_creation_start_time_,
-      base::TimeDelta::FromMilliseconds(1),
-      base::TimeDelta::FromSeconds(30),  // From kRegistrationTimeoutMS.
-      100);
+    UMA_HISTOGRAM_MEDIUM_TIMES(
+        "Profile.CreateTimeCanceledNoTimeout",
+        base::TimeTicks::Now() - profile_creation_start_time_);
     RecordProfileCreationMetrics(Profile::CREATE_STATUS_CANCELED);
   }
 
   DCHECK(managed_user_registration_utility_.get());
   managed_user_registration_utility_.reset();
 
   // Cancelling registration means the callback passed into
   // RegisterAndInitSync() won't be called, so the cleanup must be done here.
   profile_path_being_created_.clear();
   DeleteProfileAtPath(new_profile->GetPath());
@@ skipping 446 matching lines @@
   const ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
     if (existing_managed_user_id == cache.GetManagedUserIdOfProfileAtIndex(i))
       return false;
   }
   return true;
 }
 
 }  // namespace options