Flatten Connector & ConnectorImpl

services/service_manager/public/cpp/lib/service_context.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 "services/service_manager/public/cpp/service_context.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/service_manager/public/cpp/lib/connector_impl.h"
+#include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service.h"
 
 namespace service_manager {
 
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceContext, public:
 
 ServiceContext::ServiceContext(
     std::unique_ptr<service_manager::Service> service,
     mojom::ServiceRequest request,
@@ skipping 74 matching lines @@
 // ServiceContext, private:
 
 void ServiceContext::OnConnectionError() {
   if (service_->OnServiceManagerConnectionLost()) {
     // CAUTION: May delete |this|.
     QuitNow();
   }
 }
 
 }  // namespace service_manager