Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(375)

Side by Side Diff: chrome/test/ppapi/ppapi_test.h

Issue 286243003: Move JavascriptTestObserver from chrome to content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unnecessary content prefixes Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/ppapi/ppapi_browsertest.cc ('k') | chrome/test/ppapi/ppapi_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_TEST_PPAPI_PPAPI_TEST_H_ 5 #ifndef CHROME_TEST_PPAPI_PPAPI_TEST_H_
6 #define CHROME_TEST_PPAPI_PPAPI_TEST_H_ 6 #define CHROME_TEST_PPAPI_PPAPI_TEST_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "chrome/test/base/in_process_browser_test.h" 12 #include "chrome/test/base/in_process_browser_test.h"
13 #include "chrome/test/base/javascript_test_observer.h" 13 #include "content/public/test/javascript_test_observer.h"
14 #include "net/test/spawned_test_server/spawned_test_server.h" 14 #include "net/test/spawned_test_server/spawned_test_server.h"
15 15
16 namespace content { 16 namespace content {
17 class RenderViewHost; 17 class RenderViewHost;
18 } 18 }
19 19
20 class PPAPITestMessageHandler : public TestMessageHandler { 20 class PPAPITestMessageHandler : public content::TestMessageHandler {
21 public: 21 public:
22 PPAPITestMessageHandler(); 22 PPAPITestMessageHandler();
23 23
24 MessageResponse HandleMessage(const std::string& json); 24 virtual MessageResponse HandleMessage(const std::string& json) OVERRIDE;
25
26 virtual void Reset() OVERRIDE; 25 virtual void Reset() OVERRIDE;
27 26
28 const std::string& message() const { 27 const std::string& message() const {
29 return message_; 28 return message_;
30 } 29 }
31 30
32 private: 31 private:
33 std::string message_; 32 std::string message_;
34 33
35 DISALLOW_COPY_AND_ASSIGN(PPAPITestMessageHandler); 34 DISALLOW_COPY_AND_ASSIGN(PPAPITestMessageHandler);
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 const std::string& test_case) OVERRIDE; 201 const std::string& test_case) OVERRIDE;
203 }; 202 };
204 203
205 class PPAPIBrokerInfoBarTest : public OutOfProcessPPAPITest { 204 class PPAPIBrokerInfoBarTest : public OutOfProcessPPAPITest {
206 public: 205 public:
207 // PPAPITestBase override: 206 // PPAPITestBase override:
208 virtual void SetUpOnMainThread() OVERRIDE; 207 virtual void SetUpOnMainThread() OVERRIDE;
209 }; 208 };
210 209
211 #endif // CHROME_TEST_PPAPI_PPAPI_TEST_H_ 210 #endif // CHROME_TEST_PPAPI_PPAPI_TEST_H_
OLDNEW
« no previous file with comments | « chrome/test/ppapi/ppapi_browsertest.cc ('k') | chrome/test/ppapi/ppapi_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698