OLD | NEW |
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 #include "ppapi/proxy/raw_var_data.h" | 5 #include "ppapi/proxy/raw_var_data.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 IPC::ParamTraits<SerializedHandle>::Write(m, handle); | 31 IPC::ParamTraits<SerializedHandle>::Write(m, handle); |
32 } | 32 } |
33 | 33 |
34 class RawVarDataTest : public testing::Test { | 34 class RawVarDataTest : public testing::Test { |
35 public: | 35 public: |
36 RawVarDataTest() {} | 36 RawVarDataTest() {} |
37 ~RawVarDataTest() {} | 37 ~RawVarDataTest() {} |
38 | 38 |
39 // testing::Test implementation. | 39 // testing::Test implementation. |
40 virtual void SetUp() { | 40 virtual void SetUp() { |
| 41 ProxyLock::EnableLockingOnThreadForTest(); |
41 ProxyLock::Acquire(); | 42 ProxyLock::Acquire(); |
42 } | 43 } |
43 virtual void TearDown() { | 44 virtual void TearDown() { |
44 ASSERT_TRUE(PpapiGlobals::Get()->GetVarTracker()->GetLiveVars().empty()); | 45 ASSERT_TRUE(PpapiGlobals::Get()->GetVarTracker()->GetLiveVars().empty()); |
45 ProxyLock::Release(); | 46 ProxyLock::Release(); |
46 } | 47 } |
47 | 48 |
48 private: | 49 private: |
49 TestGlobals globals_; | 50 TestGlobals globals_; |
50 }; | 51 }; |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 ScopedPPVar::PassRef(), | 194 ScopedPPVar::PassRef(), |
194 PpapiGlobals::Get()->GetVarTracker()->MakeResourcePPVar(34)); | 195 PpapiGlobals::Get()->GetVarTracker()->MakeResourcePPVar(34)); |
195 EXPECT_TRUE(WriteReadAndCompare(resource.get())); | 196 EXPECT_TRUE(WriteReadAndCompare(resource.get())); |
196 | 197 |
197 // TODO(mgiuca): Test a host resource with an IPC::Message. It is currently a | 198 // TODO(mgiuca): Test a host resource with an IPC::Message. It is currently a |
198 // checkfail to deserialize such a resource. | 199 // checkfail to deserialize such a resource. |
199 } | 200 } |
200 | 201 |
201 } // namespace proxy | 202 } // namespace proxy |
202 } // namespace ppapi | 203 } // namespace ppapi |
OLD | NEW |