Hook up test runner to new layout_test_html_viewer

components/html_viewer/layout_test_html_viewer.h

Index: components/html_viewer/layout_test_html_viewer.h
diff --git a/components/html_viewer/layout_test_html_viewer.h b/components/html_viewer/layout_test_html_viewer.h
new file mode 100644
index 0000000000000000000000000000000000000000..a4cdbee3d174dbb5bfd91da0a6597cd683f2bd75
--- /dev/null
+++ b/components/html_viewer/layout_test_html_viewer.h
@@ -0,0 +1,40 @@
+// 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_LAYOUT_TEST_HTML_VIEWER_H_
+#define COMPONENTS_HTML_VIEWER_LAYOUT_TEST_HTML_VIEWER_H_
+
+#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+#include "components/html_viewer/html_viewer.h"
+#include "components/html_viewer/web_test_delegate_impl.h"
+
+namespace test_runner {
+class WebTestInterfaces;
+}
+
+namespace html_viewer {
+
+class LayoutTestHTMLViewer : public HTMLViewer {
+ public:
+  LayoutTestHTMLViewer();
+  ~LayoutTestHTMLViewer() override;
+
+ private:
+  // Overridden from ApplicationDelegate:
+  void Initialize(mojo::ApplicationImpl* app) override;
+
+  // Overridden from InterfaceFactory<ContentHandler>
+  void Create(mojo::ApplicationConnection* connection,
+              mojo::InterfaceRequest<mojo::ContentHandler> request) override;
+
+  scoped_ptr<test_runner::WebTestInterfaces> test_interfaces_;
+  WebTestDelegateImpl test_delegate_;
+
+  DISALLOW_COPY_AND_ASSIGN(LayoutTestHTMLViewer);
+};
+
+}  // namespace html_viewer
+
+#endif  // COMPONENTS_HTML_VIEWER_LAYOUT_TEST_HTML_VIEWER_H_