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

Unified Diff: mojo/services/view_manager/view_manager_unittest.cc

Issue 380413003: Mojo: Use InterfaceFactory<Interface> for service registration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: specify ownership in the Bind call Created 6 years, 5 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: mojo/services/view_manager/view_manager_unittest.cc
diff --git a/mojo/services/view_manager/view_manager_unittest.cc b/mojo/services/view_manager/view_manager_unittest.cc
index 3c400e28615f019bba8c8dc2824e50491c0e43ea..2a9b64451b4dd1cd80c5768f8014c00a102d5f39 100644
--- a/mojo/services/view_manager/view_manager_unittest.cc
+++ b/mojo/services/view_manager/view_manager_unittest.cc
@@ -18,6 +18,7 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/connect.h"
+#include "mojo/public/cpp/application/default_interface_provider.h"
#include "mojo/public/cpp/bindings/lib/router.h"
#include "mojo/service_manager/service_manager.h"
#include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
@@ -304,8 +305,7 @@ bool ViewManagerProxy::in_embed_ = false;
class TestViewManagerClientConnection
: public InterfaceImpl<ViewManagerClient> {
public:
- TestViewManagerClientConnection(ApplicationConnection* app_connection) :
- connection_(&tracker_) {
+ TestViewManagerClientConnection() : connection_(&tracker_) {
tracker_.set_delegate(&connection_);
}
@@ -382,7 +382,10 @@ class TestViewManagerClientConnection
// Used with ViewManagerService::Embed(). Creates a
// TestViewManagerClientConnection, which creates and owns the ViewManagerProxy.
-class EmbedServiceLoader : public ServiceLoader, ApplicationDelegate {
+class EmbedServiceLoader
+ : public ServiceLoader,
+ ApplicationDelegate,
+ public DefaultInterfaceProvider<TestViewManagerClientConnection> {
public:
EmbedServiceLoader() {}
virtual ~EmbedServiceLoader() {}
@@ -402,7 +405,7 @@ class EmbedServiceLoader : public ServiceLoader, ApplicationDelegate {
// ApplicationDelegate
virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
OVERRIDE {
- connection->AddService<TestViewManagerClientConnection>();
+ connection->AddServiceProvider(this);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698