Remove tcmalloc when not being used. Restore shim on Windows.

content/browser/browser_main_runner.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 "content/public/browser/browser_main_runner.h"
 
-#include "base/allocator/allocator_shim.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/statistics_recorder.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/browser_shutdown_profile_dumper.h"
 #include "content/browser/notification_service_impl.h"
@@ skipping 159 matching lines @@
       // Must happen before we try to use a message loop or display any UI.
       if (!main_loop_->InitializeToolkit())
         return 1;
 
       main_loop_->MainMessageLoopStart();
 
 // WARNING: If we get a WM_ENDSESSION, objects created on the stack here
 // are NOT deleted. If you need something to run during WM_ENDSESSION add it
 // to browser_shutdown::Shutdown or BrowserProcess::EndSession.
 
-#if defined(OS_WIN) && !defined(NO_TCMALLOC)
-      // When linking shared libraries, NO_TCMALLOC is defined, and dynamic
-      // allocator selection is not supported.
-
-      // Make this call before going multithreaded, or spawning any
-      // subprocesses.
-      base::allocator::SetupSubprocessAllocator();
-#endif
       ui::InitializeInputMethod();
     }
     main_loop_->CreateStartupTasks();
     int result_code = main_loop_->GetResultCode();
     if (result_code > 0)
       return result_code;
 
     // Return -1 to indicate no early termination.
     return -1;
   }
@@ skipping 81 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl);
 };
 
 // static
 BrowserMainRunner* BrowserMainRunner::Create() {
   return new BrowserMainRunnerImpl();
 }
 
 }  // namespace content