Changes html_viewer to get services from appropriate application

components/html_viewer/setup.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_HTML_VIEWER_SETUP_H_
 #define COMPONENTS_HTML_VIEWER_SETUP_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
@@ skipping 31 matching lines @@
   // Use to explicitly create headless regardless of command line switches.
   // This must be invoked before InitIfNecessary().
   void InitHeadless();
 
   // Inits with the specified screen size and device pixel ratio.
   // NOTE: we wait to complete setup until the device pixel ratio is available
   // as ResourceBundle uses the device pixel ratio during initialization.
   void InitIfNecessary(const gfx::Size& screen_size_in_pixels,
                        float device_pixel_ratio);
 
-  mojo::ApplicationImpl* app() const { return app_; }
   bool is_headless() const { return is_headless_; }
   bool did_init() const { return did_init_; }
 
   const gfx::Size& screen_size_in_pixels() const {
     return screen_size_in_pixels_;
   }
 
   float device_pixel_ratio() const { return device_pixel_ratio_; }
 
   scoped_refptr<base::SingleThreadTaskRunner> compositor_thread() {
     return compositor_thread_.task_runner();
   }
 
   MediaFactory* media_factory() { return media_factory_.get(); }
 
  private:
+  // App for HTMLViewer, not the document's app.
+  // WARNING: do not expose this. It's too easy to use the wrong one.
+  // HTMLDocument should be using the application it creates, not this one.
   mojo::ApplicationImpl* app_;
 
   resource_provider::ResourceLoader resource_loader_;
 
   bool is_headless_;
 
   // True once we've completed init.
   bool did_init_;
 
   float device_pixel_ratio_;
@@ skipping 14 matching lines @@
   scoped_ptr<BlinkPlatformImpl> blink_platform_;
   base::Thread compositor_thread_;
   scoped_ptr<MediaFactory> media_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Setup);
 };
 
 }  // namespace html_viewer
 
 #endif  // COMPONENTS_HTML_VIEWER_SETUP_H_