Delete content::ServiceRegistry.

content/browser/android/service_registry_android_impl.cc

 // Copyright 2016 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/browser/android/service_registry_android_impl.h"
 
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
-#include "content/public/common/service_registry.h"
 #include "jni/ServiceRegistry_jni.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "services/shell/public/cpp/interface_provider.h"
 #include "services/shell/public/cpp/interface_registry.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ScopedJavaGlobalRef;
 
 namespace content {
@@ skipping 60 matching lines @@
 
   ScopedJavaGlobalRef<jobject> j_scoped_service_registry;
   j_scoped_service_registry.Reset(env, j_service_registry);
 
   ScopedJavaGlobalRef<jobject> j_scoped_manager;
   j_scoped_manager.Reset(env, j_manager);
 
   ScopedJavaGlobalRef<jobject> j_scoped_factory;
   j_scoped_factory.Reset(env, j_factory);
 
-  if (interface_registry_) {
-    interface_registry_->AddInterface(
-        name, base::Bind(&CreateImplAndAttach, j_scoped_service_registry,
-                         j_scoped_manager, j_scoped_factory),
-        nullptr);
-  } else if (service_registry_) {
-    service_registry_->AddService(
-        name, base::Bind(&CreateImplAndAttach, j_scoped_service_registry,
-                         j_scoped_manager, j_scoped_factory),
-        nullptr);
-  } else {
-    NOTREACHED();
-  }
+  interface_registry_->AddInterface(
+      name, base::Bind(&CreateImplAndAttach, j_scoped_service_registry,
+                        j_scoped_manager, j_scoped_factory),
+      nullptr);
 }
 
 void ServiceRegistryAndroidImpl::RemoveService(
     JNIEnv* env,
     const JavaParamRef<jobject>& j_service_registry,
     const JavaParamRef<jstring>& j_name) {
   std::string name(ConvertJavaStringToUTF8(env, j_name));
-  if (interface_registry_)
-    interface_registry_->RemoveInterface(name);
-  else if (service_registry_)
-    service_registry_->RemoveService(name);
-  else
-    NOTREACHED();
+  interface_registry_->RemoveInterface(name);
 }
 
 void ServiceRegistryAndroidImpl::ConnectToRemoteService(
     JNIEnv* env,
     const JavaParamRef<jobject>& j_service_registry,
     const JavaParamRef<jstring>& j_name,
     jint j_handle) {
   std::string name(ConvertJavaStringToUTF8(env, j_name));
   mojo::ScopedMessagePipeHandle handle((mojo::MessagePipeHandle(j_handle)));
-  if (remote_interfaces_)
-    remote_interfaces_->GetInterface(name, std::move(handle));
-  else if (service_registry_)
-    service_registry_->ConnectToRemoteService(name, std::move(handle));
-  else
-    NOTREACHED();
+  remote_interfaces_->GetInterface(name, std::move(handle));
 }
 
 }  // namespace content