Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/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 1160 matching lines @@
     success = sync_message_filter()->Send(message);
 
   if (!success)
     return scoped_ptr<gfx::GpuMemoryBuffer>();
 
   return GpuMemoryBufferImpl::CreateFromHandle(
              handle, gfx::Size(width, height), internalformat)
       .PassAs<gfx::GpuMemoryBuffer>();
 }
 
-void RenderThreadImpl::ConnectToService(
+void RenderThreadImpl::AcceptConnection(
     const mojo::String& service_name,
     mojo::ScopedMessagePipeHandle message_pipe) {
   // TODO(darin): Invent some kind of registration system to use here.
   if (service_name.To<base::StringPiece>() == kRendererService_WebUISetup) {
     WebUISetupImpl::Bind(message_pipe.Pass());
   } else {
     NOTREACHED() << "Unknown service name";
   }
 }
 
@@ skipping 321 matching lines @@
   hidden_widget_count_--;
 
   if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) {
     return;
   }
 
   ScheduleIdleHandler(kLongIdleHandlerDelayMs);
 }
 
 }  // namespace content