Allow WebUI Tests to use preLoad in HtmlDialogUI.

chrome/test/data/webui/async_gen.h

Index: chrome/test/data/webui/async_gen.h
diff --git a/chrome/test/data/webui/async_gen-inl.h b/chrome/test/data/webui/async_gen.h
similarity index 63%
rename from chrome/test/data/webui/async_gen-inl.h
rename to chrome/test/data/webui/async_gen.h
index fae1af4c83d2d07390c7cf9e33b8e134cb796377..1d3ae98868777acfd9d6874cfdd5909f25a878f7 100644
--- a/chrome/test/data/webui/async_gen-inl.h
+++ b/chrome/test/data/webui/async_gen.h
@@ -1,13 +1,19 @@
 // Copyright (c) 2011 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 CHROME_TEST_DATA_WEBUI_ASYNC_GEN_H_
+#define CHROME_TEST_DATA_WEBUI_ASYNC_GEN_H_
+#pragma once
 
-#include "base/bind.h"
-#include "base/bind_helpers.h"
-#include "base/values.h"
 #include "chrome/browser/ui/webui/web_ui_browsertest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
+namespace base {
+

[James Hawkins, 2011/11/27 19:28:26]

Remove blank lines around the forward declaration.

[Sheridan Rawlins, 2011/11/29 06:57:16]

Done.

+class ListValue;
+
+}  // namespace base
+
 // C++ support class for javascript-generated asynchronous tests.
 class WebUIBrowserAsyncGenTest : public WebUIBrowserTest {
  public:
@@ -23,20 +29,10 @@ class WebUIBrowserAsyncGenTest : public WebUIBrowserTest {
     MOCK_METHOD1(HandleTornDown, void(const base::ListValue*));
 
    private:
-    void HandleCallJS(const base::ListValue* list_value) {
-      std::string call_js;
-      ASSERT_TRUE(list_value->GetString(0, &call_js));
-      web_ui_->CallJavascriptFunction(call_js);
-    }
-
-    virtual void RegisterMessages() OVERRIDE {
-      web_ui_->RegisterMessageCallback(
-          "callJS", base::Bind(&AsyncWebUIMessageHandler::HandleCallJS,
-                               base::Unretained(this)));
-      web_ui_->RegisterMessageCallback(
-          "tornDown", base::Bind(&AsyncWebUIMessageHandler::HandleTornDown,
-                                 base::Unretained(this)));
-    }
+    void HandleCallJS(const base::ListValue* list_value);
+
+    // Implements WebUIMessageHandler.

[James Hawkins, 2011/11/27 19:28:26]

// WebUIMessageHandler implementation.

[Sheridan Rawlins, 2011/11/29 06:57:16]

Done.

+    virtual void RegisterMessages() OVERRIDE;
   };
 
   // Handler for this test fixture.
@@ -55,3 +51,5 @@ class WebUIBrowserAsyncGenTest : public WebUIBrowserTest {
 
   DISALLOW_COPY_AND_ASSIGN(WebUIBrowserAsyncGenTest);
 };
+
+#endif  // CHROME_TEST_DATA_WEBUI_ASYNC_GEN_H_