Change RenderFrame to use InterfaceRegistry et al.

components/password_manager/content/renderer/credential_manager_client_browsertest.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 "components/password_manager/content/renderer/credential_manager_client.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <tuple>
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "content/public/common/service_registry.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/test/render_view_test.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
+#include "services/shell/public/cpp/interface_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebCredential.h"
 #include "third_party/WebKit/public/platform/WebCredentialManagerClient.h"
 #include "third_party/WebKit/public/platform/WebCredentialManagerError.h"
 #include "third_party/WebKit/public/platform/WebPasswordCredential.h"
 
-using content::ServiceRegistry;
-
 namespace password_manager {
 
 namespace {
 
 const char kTestCredentialPassword[] = "https://password.com/";
 const char kTestCredentialEmpty[] = "https://empty.com/";
 const char kTestCredentialReject[] = "https://reject.com/";
 
 class FakeCredentialManager : public mojom::CredentialManager {
  public:
@@ skipping 41 matching lines @@
 class CredentialManagerClientTest : public content::RenderViewTest {
  public:
   CredentialManagerClientTest()
       : callback_errored_(false), callback_succeeded_(false) {}
   ~CredentialManagerClientTest() override {}
 
   void SetUp() override {
     content::RenderViewTest::SetUp();
     client_.reset(new CredentialManagerClient(view_));
 
-    ServiceRegistry* registry =
-        view_->GetMainRenderFrame()->GetServiceRegistry();
-    registry->AddServiceOverrideForTesting(
+    shell::InterfaceProvider* remote_interfaces =
+        view_->GetMainRenderFrame()->GetRemoteInterfaces();
+    shell::InterfaceProvider::TestApi test_api(remote_interfaces);
+    test_api.SetBinderForName(
         mojom::CredentialManager::Name_,
         base::Bind(&CredentialManagerClientTest::BindCredentialManager,
                    base::Unretained(this)));
   }
 
   void TearDown() override {
     credential_.reset();
     client_.reset();
     content::RenderViewTest::TearDown();
   }
@@ skipping 140 matching lines @@
 
   EXPECT_FALSE(callback_succeeded());
   EXPECT_TRUE(callback_errored());
   EXPECT_FALSE(credential_);
   EXPECT_EQ(blink::WebCredentialManagerError::
                 WebCredentialManagerPasswordStoreUnavailableError,
             error_);
 }
 
 }  // namespace password_manager