Index: content/renderer/pepper/pepper_url_loader_host.cc |
diff --git a/content/renderer/pepper/pepper_url_loader_host.cc b/content/renderer/pepper/pepper_url_loader_host.cc |
index 3f0dbc963e00b50e4599a9f012d4c8bf51118f29..178548ee7183195870b7c24f9133ecba83efbc32 100644 |
--- a/content/renderer/pepper/pepper_url_loader_host.cc |
+++ b/content/renderer/pepper/pepper_url_loader_host.cc |
@@ -27,14 +27,14 @@ |
#include "third_party/WebKit/public/web/WebSecurityOrigin.h" |
#include "third_party/WebKit/public/web/WebURLLoaderOptions.h" |
-using WebKit::WebFrame; |
-using WebKit::WebString; |
-using WebKit::WebURL; |
-using WebKit::WebURLError; |
-using WebKit::WebURLLoader; |
-using WebKit::WebURLLoaderOptions; |
-using WebKit::WebURLRequest; |
-using WebKit::WebURLResponse; |
+using blink::WebFrame; |
+using blink::WebString; |
+using blink::WebURL; |
+using blink::WebURLError; |
+using blink::WebURLLoader; |
+using blink::WebURLLoaderOptions; |
+using blink::WebURLRequest; |
+using blink::WebURLResponse; |
#ifdef _MSC_VER |
// Do not warn about use of std::copy with raw pointers. |
@@ -98,7 +98,7 @@ PepperURLLoaderHost::~PepperURLLoaderHost() { |
// re-entering the scoped_ptr destructor with the same scoped_ptr object |
// via loader_.reset(). Be sure that loader_ is first NULL then destroy |
// the scoped_ptr. See http://crbug.com/159429. |
- scoped_ptr<WebKit::WebURLLoader> for_destruction_only(loader_.release()); |
+ scoped_ptr<blink::WebURLLoader> for_destruction_only(loader_.release()); |
} |
int32_t PepperURLLoaderHost::OnResourceMessageReceived( |
@@ -367,7 +367,7 @@ void PepperURLLoaderHost::Close() { |
GetFrame()->stopLoading(); |
} |
-WebKit::WebFrame* PepperURLLoaderHost::GetFrame() { |
+blink::WebFrame* PepperURLLoaderHost::GetFrame() { |
PepperPluginInstance* instance_object = |
renderer_ppapi_host_->GetPluginInstance(pp_instance()); |
if (!instance_object) |