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 56% |
rename from chrome/test/data/webui/async_gen-inl.h |
rename to chrome/test/data/webui/async_gen.h |
index fae1af4c83d2d07390c7cf9e33b8e134cb796377..4bc70df86852e4c7ae59b2d13a0367e4ea4b4f17 100644 |
--- a/chrome/test/data/webui/async_gen-inl.h |
+++ b/chrome/test/data/webui/async_gen.h |
@@ -1,13 +1,17 @@ |
// 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 { |
+class ListValue; |
+} // namespace base |
+ |
// C++ support class for javascript-generated asynchronous tests. |
class WebUIBrowserAsyncGenTest : public WebUIBrowserTest { |
public: |
@@ -20,23 +24,13 @@ class WebUIBrowserAsyncGenTest : public WebUIBrowserTest { |
AsyncWebUIMessageHandler(); |
~AsyncWebUIMessageHandler(); |
- MOCK_METHOD1(HandleTornDown, void(const base::ListValue*)); |
+ MOCK_METHOD1(HandleTearDown, 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); |
+ |
+ // WebUIMessageHandler implementation. |
+ virtual void RegisterMessages() OVERRIDE; |
}; |
// Handler for this test fixture. |
@@ -50,8 +44,10 @@ class WebUIBrowserAsyncGenTest : public WebUIBrowserTest { |
virtual void SetUpOnMainThread() OVERRIDE { |
WebUIBrowserTest::SetUpOnMainThread(); |
- EXPECT_CALL(message_handler_, HandleTornDown(::testing::_)); |
+ EXPECT_CALL(message_handler_, HandleTearDown(::testing::_)); |
} |
DISALLOW_COPY_AND_ASSIGN(WebUIBrowserAsyncGenTest); |
}; |
+ |
+#endif // CHROME_TEST_DATA_WEBUI_ASYNC_GEN_H_ |