Hook up test runner to new layout_test_html_viewer

components/html_viewer/html_document.h

Index: components/html_viewer/html_document.h
diff --git a/components/html_viewer/html_document.h b/components/html_viewer/html_document.h
index 6d5c5be60287b87ff0ce39fd5b4aa3ab92bc7402..fb27e8d7b452cad1a3be878d4d96a00d4d349a28 100644
--- a/components/html_viewer/html_document.h
+++ b/components/html_viewer/html_document.h
@@ -80,21 +80,11 @@ class HTMLDocument : public blink::WebViewClient,
   // Deletes this object.
   void Destroy();
 
- private:
-  // Data associated with a child iframe.
-  struct ChildFrameData {
-    mojo::View* view;
-    blink::WebTreeScopeType scope;
-  };
+  blink::WebView* web_view() const { return web_view_; }
 
+ protected:
   ~HTMLDocument() override;
 
-  // Updates the size and scale factor of the webview and related classes from
-  // |root_|.
-  void UpdateWebviewSizeFromViewSize();
-
-  void InitGlobalStateAndLoadIfNecessary();
-
   // WebViewClient methods:
   virtual blink::WebStorageNamespace* createSessionStorageNamespace();
 
@@ -129,6 +119,19 @@ class HTMLDocument : public blink::WebViewClient,
                                      blink::WebHistoryCommitType commit_type);
   virtual blink::WebEncryptedMediaClient* encryptedMediaClient();
 
+ private:
+  // Data associated with a child iframe.
+  struct ChildFrameData {
+    mojo::View* view;
+    blink::WebTreeScopeType scope;
+  };
+
+  // Updates the size and scale factor of the webview and related classes from
+  // |root_|.
+  void UpdateWebviewSizeFromViewSize();
+
+  void InitGlobalStateAndLoadIfNecessary();
+
   // ViewManagerDelegate methods:
   void OnEmbed(mojo::View* root) override;
   void OnViewManagerDestroyed(mojo::ViewManager* view_manager) override;