Hook up test runner to new layout_test_html_viewer

components/html_viewer/html_document_application_delegate.cc

 // 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.
 
 #include "components/html_viewer/html_document_application_delegate.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "components/html_viewer/global_state.h"
-#include "components/html_viewer/html_document.h"
 #include "components/html_viewer/html_document_oopif.h"
 #include "components/html_viewer/html_viewer_switches.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/connect.h"
 
 namespace html_viewer {
 
 namespace {
 
 bool EnableOOPIFs() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kOOPIF);
 }
 
+HTMLDocument* CreateHTMLDocument(HTMLDocument::CreateParams* params) {
+  return new HTMLDocument(params);
+}
+
 }  // namespace
 
 // ServiceConnectorQueue records all incoming service requests and processes
 // them once PushRequestsTo() is called. This is useful if you need to delay
 // processing incoming service requests.
 class HTMLDocumentApplicationDelegate::ServiceConnectorQueue
     : public mojo::ServiceConnector {
  public:
   ServiceConnectorQueue() {}
   ~ServiceConnectorQueue() override {}
@@ skipping 33 matching lines @@
     mojo::URLResponsePtr response,
     GlobalState* global_state,
     scoped_ptr<mojo::AppRefCount> parent_app_refcount)
     : app_(this,
            request.Pass(),
            base::Bind(&HTMLDocumentApplicationDelegate::OnTerminate,
                       base::Unretained(this))),
       parent_app_refcount_(parent_app_refcount.Pass()),
       url_(response->url),
       initial_response_(response.Pass()),
-      global_state_(global_state) {
+      global_state_(global_state),
+      html_document_creation_callback_(base::Bind(CreateHTMLDocument)) {
 }
 
 HTMLDocumentApplicationDelegate::~HTMLDocumentApplicationDelegate() {
   // Deleting the documents is going to trigger a callback to
   // OnHTMLDocumentDeleted() and remove from |documents_|. Copy the set so we
   // don't have to worry about the set being modified out from under us.
   std::set<HTMLDocument*> documents(documents_);
   for (HTMLDocument* doc : documents)
     doc->Destroy();
   DCHECK(documents_.empty());
 
   std::set<HTMLDocumentOOPIF*> documents2(documents2_);
   for (HTMLDocumentOOPIF* doc : documents2)
     doc->Destroy();
   DCHECK(documents2_.empty());
 }
 
+void HTMLDocumentApplicationDelegate::SetHTMLDocumentCreationCallback(
+    const HTMLDocumentCreationCallback& callback) {
+  html_document_creation_callback_ = callback;
+}
+
 // Callback from the quit closure. We key off this rather than
 // ApplicationDelegate::Quit() as we don't want to shut down the messageloop
 // when we quit (the messageloop is shared among multiple
 // HTMLDocumentApplicationDelegates).
 void HTMLDocumentApplicationDelegate::OnTerminate() {
   delete this;
 }
 
 // ApplicationDelegate;
 void HTMLDocumentApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
@@ skipping 59 matching lines @@
     HTMLDocumentOOPIF* document = new HTMLDocumentOOPIF(
         &app_, connection, response.Pass(), global_state_,
         base::Bind(&HTMLDocumentApplicationDelegate::OnHTMLDocumentDeleted2,
                    base::Unretained(this)));
     documents2_.insert(document);
   } else {
     HTMLDocument::CreateParams params(
         &app_, connection, response.Pass(), global_state_,
         base::Bind(&HTMLDocumentApplicationDelegate::OnHTMLDocumentDeleted,
                    base::Unretained(this)));
-    HTMLDocument* document = new HTMLDocument(&params);
+    HTMLDocument* document = html_document_creation_callback_.Run(&params);
     documents_.insert(document);
   }
 
   if (connector_queue) {
     connector_queue->PushRequestsTo(connection);
     connection->SetServiceConnector(nullptr);
   }
 }
 
 }  // namespace html_viewer