Move services/shell to services/service_manager

services/tracing/public/cpp/provider.cc

 // Copyright 2015 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/tracing/public/cpp/provider.h"
 
 #include <utility>
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_config.h"
 #include "base/trace_event/trace_event.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
 #include "services/tracing/public/cpp/switches.h"
 
 namespace tracing {
 namespace {
 
 // Controls access to |g_tracing_singleton_created|, which can be accessed from
 // different threads.
 base::LazyInstance<base::Lock>::Leaky g_singleton_lock =
     LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 105 matching lines @@
   // events. Empty string is not a valid chunk to record so skip in this case.
   if (!events_str->data().empty()) {
     recorder_->Record(mojo::String(events_str->data()));
   }
   if (!has_more_events) {
     recorder_.reset();
   }
 }
 
 }  // namespace tracing