Revert of Temporary allocation of 20Mb before and after call to ServiceProcessControl::GetHistograms

chrome/browser/service_process/service_process_control.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/service_process/service_process_control.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_delta_serialization.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/service_messages.h"
 #include "chrome/common/service_process_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
 using content::BrowserThread;
 
-namespace {
-
-// Test: On Mac, launchd_msg_send tries to allocate a 10MB buffer, but doesn't
-// handle errors and makes ugly crash dumps when close to OOM.
-// TODO(vitalybuka): Remove after few Canary builds.
-// See http://crbug.com/406227
-void AllocDebugTest() {
-#if defined(OS_MACOSX)
-  void* buffer = malloc(20 * 1024 * 1024);
-  CHECK(buffer);
-  free(buffer);
-#endif  // OS_MACOSX
-}
-
-}  // namespace
-
 // ServiceProcessControl implementation.
 ServiceProcessControl::ServiceProcessControl() {
 }
 
 ServiceProcessControl::~ServiceProcessControl() {
 }
 
 void ServiceProcessControl::ConnectInternal() {
   // If the channel has already been established then we run the task
   // and return.
@@ skipping 178 matching lines @@
     const std::vector<std::string>& pickled_histograms) {
   UMA_HISTOGRAM_ENUMERATION("CloudPrint.ServiceEvents",
                             SERVICE_EVENT_HISTOGRAMS_REPLY, SERVICE_EVENT_MAX);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   base::HistogramDeltaSerialization::DeserializeAndAddSamples(
       pickled_histograms);
   RunHistogramsCallback();
 }
 
 void ServiceProcessControl::RunHistogramsCallback() {
-  AllocDebugTest();
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!histograms_callback_.is_null()) {
     histograms_callback_.Run();
     histograms_callback_.Reset();
   }
   histograms_timeout_callback_.Cancel();
 }
 
 void ServiceProcessControl::OnPrinters(
     const std::vector<std::string>& printers) {
@@ skipping 16 matching lines @@
                             SERVICE_EVENT_INFO_REQUEST, SERVICE_EVENT_MAX);
   if (!Send(new ServiceMsg_GetCloudPrintProxyInfo()))
     return false;
   cloud_print_info_callback_ = cloud_print_info_callback;
   return true;
 }
 
 bool ServiceProcessControl::GetHistograms(
     const base::Closure& histograms_callback,
     const base::TimeDelta& timeout) {
-  AllocDebugTest();
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!histograms_callback.is_null());
   histograms_callback_.Reset();
 
   // If the service process is already running then connect to it.
   if (!CheckServiceProcessReady())
     return false;
   ConnectInternal();
 
   UMA_HISTOGRAM_ENUMERATION("CloudPrint.ServiceEvents",
@@ skipping 113 matching lines @@
   if (base::LaunchProcess(*cmd_line_, options, &process_handle_)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&Launcher::DoDetectLaunched, this));
   } else {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE, base::Bind(&Launcher::Notify, this));
   }
 }
 #endif  // !OS_MACOSX