summaryrefslogtreecommitdiffstats
path: root/chrome/test/ppapi/ppapi_test.h
diff options
context:
space:
mode:
authorteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-17 15:43:11 +0000
committerteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-17 15:43:11 +0000
commite4c3a397052d59da04347403d6c3fcefb751ff1e (patch)
tree60c707a9985c91c6b486b059c179520177541f4a /chrome/test/ppapi/ppapi_test.h
parent850aacb936e9f4170895f66b61ff1c43667762ac (diff)
downloadchromium_src-e4c3a397052d59da04347403d6c3fcefb751ff1e.zip
chromium_src-e4c3a397052d59da04347403d6c3fcefb751ff1e.tar.gz
chromium_src-e4c3a397052d59da04347403d6c3fcefb751ff1e.tar.bz2
Move JavascriptTestObserver from chrome to content.
This change moves the test support class JavascriptTestObserver from chrome/test to content/public/test. This test doesn't have any dependencies on anything in chrome/, and moving it will allow tests in content to use this utility class. This class has to move to content to allow moving some Pepper testing from chrome/ to content/ BUG=371873 Review URL: https://codereview.chromium.org/286243003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271209 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ppapi/ppapi_test.h')
-rw-r--r--chrome/test/ppapi/ppapi_test.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/test/ppapi/ppapi_test.h b/chrome/test/ppapi/ppapi_test.h
index d81a9f8..8385bca 100644
--- a/chrome/test/ppapi/ppapi_test.h
+++ b/chrome/test/ppapi/ppapi_test.h
@@ -10,19 +10,18 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/javascript_test_observer.h"
+#include "content/public/test/javascript_test_observer.h"
#include "net/test/spawned_test_server/spawned_test_server.h"
namespace content {
class RenderViewHost;
}
-class PPAPITestMessageHandler : public TestMessageHandler {
+class PPAPITestMessageHandler : public content::TestMessageHandler {
public:
PPAPITestMessageHandler();
- MessageResponse HandleMessage(const std::string& json);
-
+ virtual MessageResponse HandleMessage(const std::string& json) OVERRIDE;
virtual void Reset() OVERRIDE;
const std::string& message() const {