| Index: components/password_manager/content/renderer/credential_manager_client_browsertest.cc
|
| diff --git a/components/password_manager/content/renderer/credential_manager_client_browsertest.cc b/components/password_manager/content/renderer/credential_manager_client_browsertest.cc
|
| index e7f7d90f8778b8474bd6eff62f0ba015d6bd07c0..83c54441bf049c094bd4f932c41f2bdc34a49054 100644
|
| --- a/components/password_manager/content/renderer/credential_manager_client_browsertest.cc
|
| +++ b/components/password_manager/content/renderer/credential_manager_client_browsertest.cc
|
| @@ -12,19 +12,17 @@
|
| #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 {
|
| @@ -86,9 +84,10 @@ class CredentialManagerClientTest : public content::RenderViewTest {
|
| 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)));
|
|
|