Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(962)

Unified Diff: content/browser/vibration_browsertest.cc

Issue 2079943002: Change RenderFrame to use InterfaceRegistry et al. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a2
Patch Set: . Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/vibration_browsertest.cc
diff --git a/content/browser/vibration_browsertest.cc b/content/browser/vibration_browsertest.cc
index e0df1efdef9f8a81a04cf74c0676fde928ec7170..26779911514e0bee592166fbc3a7a9400e0834fa 100644
--- a/content/browser/vibration_browsertest.cc
+++ b/content/browser/vibration_browsertest.cc
@@ -11,7 +11,6 @@
#include "build/build_config.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
-#include "content/public/common/service_registry.h"
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/content_browser_test.h"
#include "content/public/test/content_browser_test_utils.h"
@@ -19,6 +18,7 @@
#include "content/shell/browser/shell.h"
#include "device/vibration/vibration_manager.mojom.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "services/shell/public/cpp/interface_registry.h"
// These tests run against a dummy implementation of the VibrationManager
// service. That is, they verify that the service implementation is correctly
@@ -81,7 +81,7 @@ class VibrationTest : public ContentBrowserTest {
void SetUpOnMainThread() override {
ResetGlobalValues();
- GetMainFrame()->GetServiceRegistry()->AddService(
+ GetMainFrame()->GetInterfaceRegistry()->AddInterface(
base::Bind(&FakeVibrationManager::Create));
}
@@ -157,7 +157,7 @@ IN_PROC_BROWSER_TEST_F(VibrationTest,
ASSERT_TRUE(NavigateToURL(shell(), GetTestUrl(".", "page_with_iframe.html")));
RenderFrameHost* iframe = ChildFrameAt(GetMainFrame(), 0);
- iframe->GetServiceRegistry()->AddService(
+ iframe->GetInterfaceRegistry()->AddInterface(
base::Bind(&FakeVibrationManager::Create));
ASSERT_TRUE(Vibrate(1234, iframe));
g_wait_vibrate_runner->Run();
@@ -174,7 +174,7 @@ IN_PROC_BROWSER_TEST_F(VibrationTest,
ASSERT_TRUE(NavigateToURL(shell(), GetTestUrl(".", "page_with_iframe.html")));
RenderFrameHost* iframe = ChildFrameAt(GetMainFrame(), 0);
- iframe->GetServiceRegistry()->AddService(
+ iframe->GetInterfaceRegistry()->AddInterface(
base::Bind(&FakeVibrationManager::Create));
ASSERT_TRUE(Vibrate(1234, iframe));
g_wait_vibrate_runner->Run();
@@ -190,7 +190,7 @@ IN_PROC_BROWSER_TEST_F(VibrationTest,
ASSERT_TRUE(NavigateToURL(shell(), GetTestUrl(".", "page_with_iframe.html")));
RenderFrameHost* iframe = ChildFrameAt(GetMainFrame(), 0);
- iframe->GetServiceRegistry()->AddService(
+ iframe->GetInterfaceRegistry()->AddInterface(
base::Bind(&FakeVibrationManager::Create));
ASSERT_TRUE(Vibrate(1234, iframe));
g_wait_vibrate_runner->Run();
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/browser/webui/web_ui_mojo_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698