summaryrefslogtreecommitdiffstats
path: root/webkit/plugins/ppapi
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/plugins/ppapi')
-rw-r--r--webkit/plugins/ppapi/ppapi_plugin_instance.cc4
-rw-r--r--webkit/plugins/ppapi/url_request_info_unittest.cc18
2 files changed, 11 insertions, 11 deletions
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index c8359f9..a896e06 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -199,12 +199,12 @@ void RectToPPRect(const gfx::Rect& input, PP_Rect* output) {
PluginInstance* PluginInstance::Create1_0(PluginDelegate* delegate,
PluginModule* module,
const void* ppp_instance_if_1_0) {
- const PPP_Instance_1_0* interface =
+ const PPP_Instance_1_0* instance =
static_cast<const PPP_Instance_1_0*>(ppp_instance_if_1_0);
return new PluginInstance(
delegate,
module,
- new ::ppapi::PPP_Instance_Combined(*interface));
+ new ::ppapi::PPP_Instance_Combined(*instance));
}
PluginInstance::PluginInstance(
diff --git a/webkit/plugins/ppapi/url_request_info_unittest.cc b/webkit/plugins/ppapi/url_request_info_unittest.cc
index dd8d0f7..f34d448 100644
--- a/webkit/plugins/ppapi/url_request_info_unittest.cc
+++ b/webkit/plugins/ppapi/url_request_info_unittest.cc
@@ -119,16 +119,16 @@ WebView* URLRequestInfoTest::web_view_;
WebFrame* URLRequestInfoTest::frame_;
TEST_F(URLRequestInfoTest, GetInterface) {
- const PPB_URLRequestInfo* interface =
+ const PPB_URLRequestInfo* request_info =
::ppapi::thunk::GetPPB_URLRequestInfo_Thunk();
- EXPECT_TRUE(interface);
- EXPECT_TRUE(interface->Create);
- EXPECT_TRUE(interface->IsURLRequestInfo);
- EXPECT_TRUE(interface->SetProperty);
- EXPECT_TRUE(interface->AppendDataToBody);
- EXPECT_TRUE(interface->AppendFileToBody);
- EXPECT_TRUE(interface->Create);
- EXPECT_TRUE(interface->Create);
+ EXPECT_TRUE(request_info);
+ EXPECT_TRUE(request_info->Create);
+ EXPECT_TRUE(request_info->IsURLRequestInfo);
+ EXPECT_TRUE(request_info->SetProperty);
+ EXPECT_TRUE(request_info->AppendDataToBody);
+ EXPECT_TRUE(request_info->AppendFileToBody);
+ EXPECT_TRUE(request_info->Create);
+ EXPECT_TRUE(request_info->Create);
}
TEST_F(URLRequestInfoTest, AsURLRequestInfo) {