Remove dead code left over from old-style WebCompositor initialization path.

content/renderer/render_thread_impl.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/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 247 matching lines @@
 
   RemoveFilter(vc_manager_->video_capture_message_filter());
 
   RemoveFilter(db_message_filter_.get());
   db_message_filter_ = NULL;
 
   // Shutdown the file thread if it's running.
   if (file_thread_.get())
     file_thread_->Stop();
 
-#ifdef WEBCOMPOSITOR_HAS_INITIALIZE
   if (compositor_initialized_) {
     WebKit::WebCompositor::shutdown();
     compositor_initialized_ = false;
   }
-#endif
   if (compositor_thread_.get()) {
     RemoveFilter(compositor_thread_->GetMessageFilter());
     compositor_thread_.reset();
   }
 
   if (webkit_platform_support_.get())
     WebKit::shutdown();
 
   GpuChannelHostFactory::set_instance(NULL);
   lazy_tls.Pointer()->Set(NULL);
@@ skipping 173 matching lines @@
   v8::V8::SetCreateHistogramFunction(CreateHistogram);
   v8::V8::SetAddHistogramSampleFunction(AddHistogramSample);
 
   webkit_platform_support_.reset(new RendererWebKitPlatformSupportImpl);
   WebKit::initialize(webkit_platform_support_.get());
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableThreadedCompositing)) {
     compositor_thread_.reset(new CompositorThread(this));
     AddFilter(compositor_thread_->GetMessageFilter());
-#ifdef WEBCOMPOSITOR_HAS_INITIALIZE
     WebKit::WebCompositor::initialize(compositor_thread_->GetWebThread());
-#else
-    WebKit::WebCompositor::setThread(compositor_thread_->GetWebThread());
-#endif
-  } else {
-#ifdef WEBCOMPOSITOR_HAS_INITIALIZE
+  } else
     WebKit::WebCompositor::initialize(NULL);
-#endif
-  }
   compositor_initialized_ = true;
 
   WebScriptController::enableV8SingleThreadMode();
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   webkit_glue::EnableWebCoreLogChannels(
       command_line.GetSwitchValueASCII(switches::kWebCoreLogChannels));
 
   if (command_line.HasSwitch(switches::kPlaybackMode) ||
@@ skipping 472 matching lines @@
 
 scoped_refptr<base::MessageLoopProxy>
 RenderThreadImpl::GetFileThreadMessageLoopProxy() {
   DCHECK(message_loop() == MessageLoop::current());
   if (!file_thread_.get()) {
     file_thread_.reset(new base::Thread("Renderer::FILE"));
     file_thread_->Start();
   }
   return file_thread_->message_loop_proxy();
 }