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

Side by Side Diff: ppapi/tests/test_instance_deprecated.h

Issue 8536031: Reland http://codereview.chromium.org/8477015 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge AGAIN Created 9 years, 1 month 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 | « ppapi/tests/test_image_data.cc ('k') | ppapi/tests/test_instance_deprecated.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 PPAPI_TESTS_TEST_INSTANCE_H_ 5 #ifndef PPAPI_TESTS_TEST_INSTANCE_H_
6 #define PPAPI_TESTS_TEST_INSTANCE_H_ 6 #define PPAPI_TESTS_TEST_INSTANCE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ppapi/tests/test_case.h" 11 #include "ppapi/tests/test_case.h"
12 12
13 class TestInstance : public TestCase { 13 class TestInstance : public TestCase {
14 public: 14 public:
15 TestInstance(TestingInstance* instance); 15 TestInstance(TestingInstance* instance);
16 16
17 // TestCase implementation. 17 // TestCase implementation.
18 virtual bool Init(); 18 virtual bool Init();
19 virtual void RunTest(); 19 virtual void RunTests(const std::string& filter);
20 20
21 void set_string(const std::string& s) { string_ = s; } 21 void set_string(const std::string& s) { string_ = s; }
22 22
23 protected: 23 protected:
24 // Test case protected overrides. 24 // Test case protected overrides.
25 virtual pp::deprecated::ScriptableObject* CreateTestObject(); 25 virtual pp::deprecated::ScriptableObject* CreateTestObject();
26 26
27 private: 27 private:
28 std::string TestExecuteScript(); 28 std::string TestExecuteScript();
29 29
30 // Value written by set_string which is called by the ScriptableObject. This 30 // Value written by set_string which is called by the ScriptableObject. This
31 // allows us to keep track of what was called. 31 // allows us to keep track of what was called.
32 std::string string_; 32 std::string string_;
33 }; 33 };
34 34
35 #endif // PPAPI_TESTS_TEST_INSTANCE_H_ 35 #endif // PPAPI_TESTS_TEST_INSTANCE_H_
OLDNEW
« no previous file with comments | « ppapi/tests/test_image_data.cc ('k') | ppapi/tests/test_instance_deprecated.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698