[Fuchsia] Remove ScopedServiceDirectoryClientForCurrentProcessForTest

This test class isn't being used and ServiceDirectoryClient is being
deprecated, so remove this class.

Test: Tests throughout code base still pass.

Bug: 974072
Change-Id: Ie6dc43bfb9f1cfb69bab0d52479d98d43e48ecd5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1768908
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690086}

base/fuchsia/service_directory_client.cc

@@ -58,20 +58,5 @@ ServiceDirectoryClient::ProcessInstance() {
   return service_directory_client_ptr.get();
 }
 
-ScopedServiceDirectoryClientForCurrentProcessForTest::
-    ScopedServiceDirectoryClientForCurrentProcessForTest(
-        fidl::InterfaceHandle<::fuchsia::io::Directory> directory)
-    : old_client_(std::move(*ServiceDirectoryClient::ProcessInstance())) {
-  *ServiceDirectoryClient::ProcessInstance() =
-      std::make_unique<ServiceDirectoryClient>(std::move(directory));
-  client_ = ServiceDirectoryClient::ProcessInstance()->get();
-}
-
-ScopedServiceDirectoryClientForCurrentProcessForTest::
-    ~ScopedServiceDirectoryClientForCurrentProcessForTest() {
-  DCHECK_EQ(ServiceDirectoryClient::ProcessInstance()->get(), client_);
-  *ServiceDirectoryClient::ProcessInstance() = std::move(old_client_);
-}
-
 }  // namespace fuchsia
 }  // namespace base

base/fuchsia/service_directory_client.h

@@ -25,8 +25,6 @@ class SynchronousInterfacePtr;
 namespace base {
 namespace fuchsia {
 
-class ScopedServiceDirectoryClientForCurrentProcessForTest;
-
 // Helper for connecting to services from a supplied fuchsia.io.Directory.
 class BASE_EXPORT ServiceDirectoryClient {
  public:
@@ -71,7 +69,6 @@ class BASE_EXPORT ServiceDirectoryClient {
                                      zx::channel request) const;
 
  private:
-  friend class ScopedServiceDirectoryClientForCurrentProcessForTest;
   ServiceDirectoryClient();
 
   // Creates a ServiceDirectoryClient connected to the process' "/svc"
@@ -88,22 +85,6 @@ class BASE_EXPORT ServiceDirectoryClient {
   DISALLOW_COPY_AND_ASSIGN(ServiceDirectoryClient);
 };
 
-// Replaces the current process' ServiceDirectoryClient with the supplied
-// |directory|, and restores it when going out-of-scope.
-class BASE_EXPORT ScopedServiceDirectoryClientForCurrentProcessForTest {
- public:
-  explicit ScopedServiceDirectoryClientForCurrentProcessForTest(
-      fidl::InterfaceHandle<::fuchsia::io::Directory> directory);
-  ~ScopedServiceDirectoryClientForCurrentProcessForTest();
-
- private:
-  ServiceDirectoryClient* client_;
-  std::unique_ptr<ServiceDirectoryClient> old_client_;
-
-  DISALLOW_COPY_AND_ASSIGN(
-      ScopedServiceDirectoryClientForCurrentProcessForTest);
-};
-
 }  // namespace fuchsia
 }  // namespace base