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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/service_manager/service_manager_unittest.cc

Issue 423963004: First cut at "content handling" support in Mojo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use URLResponse with ContentHandler interface instead of data pipe Created 6 years, 4 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
« mojo/service_manager/service_manager.h ('K') | « mojo/service_manager/service_manager.cc ('k') | mojo/services/public/interfaces/content_handler/content_handler.mojom » ('j') | mojo/shell/context.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/service_manager/service_manager_unittest.cc
diff --git a/mojo/service_manager/service_manager_unittest.cc b/mojo/service_manager/service_manager_unittest.cc
index b1abb79aa04bbc026eb3bafc61782a1a98084ab2..8a98bed8e2af3700b5e9b754b8c39e06917538dc 100644
--- a/mojo/service_manager/service_manager_unittest.cc
+++ b/mojo/service_manager/service_manager_unittest.cc
@@ -121,9 +121,10 @@ class TestServiceLoader : public ServiceLoader,
virtual void LoadService(
ServiceManager* manager,
const GURL& url,
- ScopedMessagePipeHandle service_provider_handle) OVERRIDE {
+ scoped_refptr<LoadServiceCallbacks> callbacks) OVERRIDE {
++num_loads_;
- test_app_.reset(new ApplicationImpl(this, service_provider_handle.Pass()));
+ test_app_.reset(
+ new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
}
virtual void OnServiceError(ServiceManager* manager,
@@ -328,8 +329,9 @@ class Tester : public ApplicationDelegate,
virtual void LoadService(
ServiceManager* manager,
const GURL& url,
- ScopedMessagePipeHandle shell_handle) OVERRIDE {
- app_.reset(new ApplicationImpl(this, shell_handle.Pass()));
+ scoped_refptr<LoadServiceCallbacks> callbacks) OVERRIDE {
+ app_.reset(
+ new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
}
virtual void OnServiceError(ServiceManager* manager,
« mojo/service_manager/service_manager.h ('K') | « mojo/service_manager/service_manager.cc ('k') | mojo/services/public/interfaces/content_handler/content_handler.mojom » ('j') | mojo/shell/context.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698