Removes ServiceProviders from ViewManager::Embed

components/html_viewer/html_viewer.cc

Index: components/html_viewer/html_viewer.cc
diff --git a/components/html_viewer/html_viewer.cc b/components/html_viewer/html_viewer.cc
index c8919870fa38b4fe9b42f708eef64b683c419ab3..972e7e8ff2881e899c13d706563990b6de9931f0 100644
--- a/components/html_viewer/html_viewer.cc
+++ b/components/html_viewer/html_viewer.cc
@@ -162,11 +162,11 @@ class HTMLViewer : public mojo::ApplicationDelegate,
   }
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
-    // If we're not being connected to from the view manager assume we're being
+    // If we're not being connected to from the browser assume we're being
     // run in tests, or a headless environment, in which case we'll never get a
     // ui and there is no point in waiting for it.
-    if (connection->GetRemoteApplicationURL() != "mojo://view_manager/" &&
-        !setup_->did_init()) {
+    if (!setup_->did_init() &&
+        connection->GetRemoteApplicationURL() != "mojo://browser/") {

[Ben Goodger (Google), 2015/06/09 20:27:27]

oof this feels like a layering violation.

seems like this just controls whether some resources are loaded. can that just
always be done even for tests? that'd make this much simpler & remove the
layering violation.

[sky, 2015/06/09 21:35:31]

It's more subtle than that. But, we have a switch for headless already. So, I
added that to running the apptest and we're good. This code has been nuked.

       setup_->InitHeadless();
     }
     connection->AddService(this);