Index: ppapi/proxy/ppb_var_unittest.cc |
diff --git a/ppapi/proxy/ppb_var_unittest.cc b/ppapi/proxy/ppb_var_unittest.cc |
index 16683d939d2fe9c537801ec46542c96085c6473f..6a6fbae85921d62a4eb4aecba724b1bb687de898 100644 |
--- a/ppapi/proxy/ppb_var_unittest.cc |
+++ b/ppapi/proxy/ppb_var_unittest.cc |
@@ -10,7 +10,7 @@ |
#include "ppapi/c/pp_var.h" |
#include "ppapi/c/ppb_var.h" |
#include "ppapi/proxy/ppapi_proxy_test.h" |
-#include "ppapi/proxy/ppb_var_proxy.h" |
+#include "ppapi/shared_impl/ppb_var_impl.h" |
namespace { |
std::string VarToString(const PP_Var& var, const PPB_Var* ppb_var) { |
@@ -30,7 +30,7 @@ class PPB_VarTest : public PluginProxyTest { |
public: |
PPB_VarTest() |
: test_strings_(kNumStrings), vars_(kNumStrings), |
- ppb_var_(GetPPB_Var_Interface()) { |
+ ppb_var_(ppapi::PPB_Var_Impl::GetVarInterface()) { |
// Set the value of test_strings_[i] to "i". |
for (size_t i = 0; i < kNumStrings; ++i) |
test_strings_[i] = base::IntToString(i); |
@@ -44,9 +44,8 @@ class PPB_VarTest : public PluginProxyTest { |
// Test basic String operations. |
TEST_F(PPB_VarTest, Strings) { |
for (size_t i = 0; i < kNumStrings; ++i) { |
- vars_[i] = ppb_var_->VarFromUtf8(pp_module(), |
- test_strings_[i].c_str(), |
- test_strings_[i].length()); |
+ vars_[i] = ppb_var_->VarFromUtf8(test_strings_[i].c_str(), |
+ test_strings_[i].length()); |
EXPECT_EQ(test_strings_[i], VarToString(vars_[i], ppb_var_)); |
} |
// At this point, they should each have a ref count of 1. Add some more. |
@@ -103,10 +102,9 @@ class CreateVarThreadDelegate : public base::PlatformThread::Delegate { |
} |
virtual ~CreateVarThreadDelegate() {} |
virtual void ThreadMain() { |
- const PPB_Var* ppb_var = ppapi::proxy::GetPPB_Var_Interface(); |
+ const PPB_Var* ppb_var = ppapi::PPB_Var_Impl::GetVarInterface(); |
for (size_t i = 0; i < size_; ++i) { |
- vars_out_[i] = ppb_var->VarFromUtf8(pp_module_, |
- strings_in_[i].c_str(), |
+ vars_out_[i] = ppb_var->VarFromUtf8(strings_in_[i].c_str(), |
strings_in_[i].length()); |
strings_out_[i] = VarToString(vars_out_[i], ppb_var); |
} |
@@ -127,7 +125,7 @@ class ChangeRefVarThreadDelegate : public base::PlatformThread::Delegate { |
} |
virtual ~ChangeRefVarThreadDelegate() {} |
virtual void ThreadMain() { |
- const PPB_Var* ppb_var = ppapi::proxy::GetPPB_Var_Interface(); |
+ const PPB_Var* ppb_var = ppapi::PPB_Var_Impl::GetVarInterface(); |
// Increment and decrement the reference count for each var kRefsToAdd |
// times. Note that we always AddRef once before doing the matching Release, |
// to ensure that we never accidentally release the last reference. |
@@ -155,7 +153,7 @@ class RemoveRefVarThreadDelegate : public base::PlatformThread::Delegate { |
} |
virtual ~RemoveRefVarThreadDelegate() {} |
virtual void ThreadMain() { |
- const PPB_Var* ppb_var = ppapi::proxy::GetPPB_Var_Interface(); |
+ const PPB_Var* ppb_var = ppapi::PPB_Var_Impl::GetVarInterface(); |
for (size_t i = 0; i < kNumStrings; ++i) { |
ppb_var->Release(vars_[i]); |
} |