| Index: content/child/npapi/plugin_url_fetcher.h
|
| diff --git a/content/child/npapi/plugin_url_fetcher.h b/content/child/npapi/plugin_url_fetcher.h
|
| index 4e5e2ffc57d142962d4eb5e129e196a1538ff1f4..0d621222a89c6c88d642e75908055f7c495d598b 100644
|
| --- a/content/child/npapi/plugin_url_fetcher.h
|
| +++ b/content/child/npapi/plugin_url_fetcher.h
|
| @@ -8,8 +8,8 @@
|
| #include <string>
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "content/public/child/resource_loader_bridge.h"
|
| #include "url/gurl.h"
|
| -#include "webkit/child/resource_loader_bridge.h"
|
|
|
| namespace webkit_glue {
|
| class MultipartResponseDelegate;
|
| @@ -20,7 +20,7 @@ namespace content {
|
| class PluginStreamUrl;
|
|
|
| // Fetches URLS for a plugin using ResourceDispatcher.
|
| -class PluginURLFetcher : public webkit_glue::ResourceLoaderBridge::Peer {
|
| +class PluginURLFetcher : public ResourceLoaderBridge::Peer {
|
| public:
|
| PluginURLFetcher(PluginStreamUrl* plugin_stream,
|
| const GURL& url,
|
| @@ -47,7 +47,7 @@ class PluginURLFetcher : public webkit_glue::ResourceLoaderBridge::Peer {
|
| bool pending_failure_notification() { return pending_failure_notification_; }
|
|
|
| private:
|
| - // webkit_glue::ResourceLoaderBridge::Peer implementation:
|
| + // ResourceLoaderBridge::Peer implementation:
|
| virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
|
| virtual bool OnReceivedRedirect(const GURL& new_url,
|
| const webkit_glue::ResourceResponseInfo& info,
|
| @@ -81,7 +81,7 @@ class PluginURLFetcher : public webkit_glue::ResourceLoaderBridge::Peer {
|
|
|
| scoped_ptr<webkit_glue::MultipartResponseDelegate> multipart_delegate_;
|
|
|
| - scoped_ptr<webkit_glue::ResourceLoaderBridge> bridge_;
|
| + scoped_ptr<ResourceLoaderBridge> bridge_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PluginURLFetcher);
|
| };
|
|
|