Removes ServiceProviders from ViewManager::Embed

components/html_viewer/html_viewer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
@@ skipping 144 matching lines @@
   ~HTMLViewer() override {}
 
  private:
   // Overridden from ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* app) override {
     app_ = app;
     setup_.reset(new Setup(app));
   }
 
   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);
     return true;
   }
 
   // Overridden from InterfaceFactory<ContentHandler>
   void Create(ApplicationConnection* connection,
               mojo::InterfaceRequest<ContentHandler> request) override {
     new ContentHandlerImpl(setup_.get(), app_, request.Pass());
   }
 
   scoped_ptr<Setup> setup_;
   mojo::ApplicationImpl* app_;
 
   DISALLOW_COPY_AND_ASSIGN(HTMLViewer);
 };
 
 }  // namespace html_viewer
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new html_viewer::HTMLViewer);
   return runner.Run(shell_handle);
 }