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

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

Issue 502143003: Revert of Minor changes to allow Pepper InstancePrivate tests to pass with gin (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | « ppapi/shared_impl/scoped_pp_var.h ('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) 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 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 virtual ~TestInstance(); 16 virtual ~TestInstance();
17 17
18 // TestCase implementation. 18 // TestCase implementation.
19 virtual bool Init(); 19 virtual bool Init();
20 virtual void RunTests(const std::string& filter); 20 virtual void RunTests(const std::string& filter);
21 21
22 void set_string(const std::string& s) { string_ = s; } 22 void set_string(const std::string& s) { string_ = s; }
23 23
24 // Leak a reference to the given var, but ignore the leak in the leak checking 24 // Leak a reference to the given var, but ignore the leak in the leak checking
25 // that happens at shutdown. This allows us to test the "ForceFree" that 25 // that happens at shutdown. This allows us to test the "ForceFree" that
26 // happens on instance shutdown. 26 // happens on instance shutdown.
27 void LeakReferenceAndIgnore(const pp::Var& leaked); 27 void LeakReferenceAndIgnore(const pp::Var& leaked);
28 28
29 void set_instance_object_destroyed(bool destroyed) {
30 instance_object_destroyed_ = destroyed;
31 }
32
33 protected: 29 protected:
34 // Test case protected overrides. 30 // Test case protected overrides.
35 virtual pp::deprecated::ScriptableObject* CreateTestObject(); 31 virtual pp::deprecated::ScriptableObject* CreateTestObject();
36 32
37 private: 33 private:
38 std::string TestExecuteScript(); 34 std::string TestExecuteScript();
39 std::string TestRecursiveObjects(); 35 std::string TestRecursiveObjects();
40 std::string TestLeakedObjectDestructors(); 36 std::string TestLeakedObjectDestructors();
41 std::string TestSetupExecuteScriptAtInstanceShutdown(); 37 std::string TestSetupExecuteScriptAtInstanceShutdown();
42 std::string TestExecuteScriptAtInstanceShutdown(); 38 std::string TestExecuteScriptAtInstanceShutdown();
43 39
44 // Value written by set_string which is called by the ScriptableObject. This 40 // Value written by set_string which is called by the ScriptableObject. This
45 // allows us to keep track of what was called. 41 // allows us to keep track of what was called.
46 std::string string_; 42 std::string string_;
47
48 // Whether the instance object for this instance has been destroyed.
49 bool instance_object_destroyed_;
50 }; 43 };
51 44
52 #endif // PPAPI_TESTS_TEST_INSTANCE_H_ 45 #endif // PPAPI_TESTS_TEST_INSTANCE_H_
OLDNEW
« no previous file with comments | « ppapi/shared_impl/scoped_pp_var.h ('k') | ppapi/tests/test_instance_deprecated.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698