Add some simple HTMLViewer apptests.

mojo/services/html_viewer/html_document.h

 // 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.
 
 #ifndef MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_
 #define MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_
 
 #include <set>
 
 #include "base/callback.h"
@@ skipping 36 matching lines @@
 
 // A view for a single HTML document.
 class HTMLDocument : public blink::WebViewClient,
                      public blink::WebFrameClient,
                      public mojo::ViewManagerDelegate,
                      public mojo::ViewObserver,
                      public mojo::InterfaceFactory<mojo::AxProvider> {
  public:
   // Load a new HTMLDocument with |response|.
   //
-  // |services| should be used to implement a ServiceProvider which exposes
-  // services to the connecting application.
+  // Services are offered to the connecting application via |service_provider|.
   // Commonly, the connecting application is the ViewManager and it will
   // request ViewManagerClient.
   //
   // |shell| is the Shell connection for this mojo::Application.
-  HTMLDocument(mojo::InterfaceRequest<mojo::ServiceProvider> services,
+  HTMLDocument(mojo::ServiceProviderImpl* service_provider,
                mojo::URLResponsePtr response,
                mojo::Shell* shell,
                scoped_refptr<base::MessageLoopProxy> compositor_thread,
                WebMediaPlayerFactory* web_media_player_factory,
                bool is_headless);
   virtual ~HTMLDocument();
 
  private:
   // Updates the size and scale factor of the webview and related classes from
   // |root_|.
@@ skipping 51 matching lines @@
   void OnViewDestroyed(mojo::View* view) override;
   void OnViewInputEvent(mojo::View* view, const mojo::EventPtr& event) override;
 
   // InterfaceFactory<AxProvider>
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojo::AxProvider> request) override;
 
   void Load(mojo::URLResponsePtr response);
 
   mojo::URLResponsePtr response_;
-  mojo::ServiceProviderImpl exported_services_;
   mojo::ServiceProviderPtr embedder_service_provider_;
   mojo::Shell* shell_;
   mojo::LazyInterfacePtr<mojo::NavigatorHost> navigator_host_;
   blink::WebView* web_view_;
   mojo::View* root_;
   mojo::ViewManagerClientFactory view_manager_client_factory_;
   scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_;
   scoped_refptr<base::MessageLoopProxy> compositor_thread_;
   WebMediaPlayerFactory* web_media_player_factory_;
 
   // EncryptedMediaClient attached to this frame; lazily initialized.
   scoped_ptr<media::WebEncryptedMediaClientImpl> web_encrypted_media_client_;
   scoped_ptr<media::MediaPermission> media_permission_;
 
   // HTMLDocument owns these pointers.
   std::set<AxProviderImpl*> ax_provider_impls_;
 
   // Set if the content will never be displayed.
   bool is_headless_;
 
   DISALLOW_COPY_AND_ASSIGN(HTMLDocument);
 };
 
 }  // namespace html_viewer
 
 #endif  // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_