Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/shell/dbus_service_loader_linux.cc

 // Copyright 2014 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 "mojo/shell/dbus_service_loader_linux.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 19 matching lines @@
 // Manages the connection to a single externally-running service.
 class DBusServiceLoader::LoadContext {
  public:
   // Kicks off the attempt to bootstrap a connection to the externally-running
   // service specified by url_.
   // Creates a MessagePipe and passes one end over DBus to the service. Then,
   // calls ExternalService::Activate(ShellHandle) over the now-shared pipe.
   LoadContext(DBusServiceLoader* loader,
               const scoped_refptr<dbus::Bus>& bus,
               const GURL& url,
-              ScopedMessagePipeHandle service_provider_handle)
+              ScopedMessagePipeHandle shell_handle)
       : loader_(loader),
         bus_(bus),
         service_dbus_proxy_(NULL),
         url_(url),
-        service_provider_handle_(service_provider_handle.Pass()),
+        shell_handle_(shell_handle.Pass()),
         keep_alive_(loader->context_) {
     base::PostTaskAndReplyWithResult(
         loader_->context_->task_runners()->io_runner(),
         FROM_HERE,
         base::Bind(&LoadContext::CreateChannelOnIOThread,
                    base::Unretained(this)),
         base::Bind(&LoadContext::ConnectChannel, base::Unretained(this)));
   }
 
   virtual ~LoadContext() {
@@ skipping 45 matching lines @@
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&LoadContext::ActivateService, base::Unretained(this)));
   }
 
   // Sends a ShellHandle over to the now-connected externally-running service,
   // using the Mojo ExternalService API.
   void ActivateService(dbus::Response* response) {
     mojo::AllocationScope scope;
     external_service_->Activate(
         mojo::ScopedMessagePipeHandle(
-            mojo::MessagePipeHandle(
-                service_provider_handle_.release().value())));
+            mojo::MessagePipeHandle(shell_handle_.release().value())));
   }
 
   // Should the ExternalService disappear completely, destroy connection state.
   // NB: This triggers off of the service disappearing from
   // DBus. Perhaps there's a way to watch at the Mojo layer instead,
   // and that would be superior?
   void HandleNameOwnerChanged(const std::string& old_owner,
                               const std::string& new_owner) {
     DCHECK(loader_->context_->task_runners()->ui_runner()->
            BelongsToCurrentThread());
 
     if (new_owner.empty()) {
       loader_->context_->task_runners()->ui_runner()->PostTask(
           FROM_HERE,
           base::Bind(&DBusServiceLoader::ForgetService,
                      base::Unretained(loader_), url_));
     }
   }
 
   DBusServiceLoader* const loader_;
   scoped_refptr<dbus::Bus> bus_;
   dbus::ObjectProxy* service_dbus_proxy_;  // Owned by bus_;
   const GURL url_;
-  ScopedMessagePipeHandle service_provider_handle_;
+  ScopedMessagePipeHandle shell_handle_;
   KeepAlive keep_alive_;
   scoped_ptr<common::ChannelInit> channel_init_;
   ExternalServicePtr external_service_;
 
   DISALLOW_COPY_AND_ASSIGN(LoadContext);
 };
 
 DBusServiceLoader::DBusServiceLoader(Context* context) : context_(context) {
   dbus::Bus::Options options;
   options.bus_type = dbus::Bus::SESSION;
@@ skipping 27 matching lines @@
   DCHECK(it != url_to_load_context_.end()) << url;
 
   LoadContext* doomed = it->second;
   url_to_load_context_.erase(it);
 
   delete doomed;
 }
 
 }  // namespace shell
 }  // namespace mojo