summaryrefslogtreecommitdiffstats
path: root/webkit/glue/media
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue/media')
-rw-r--r--webkit/glue/media/buffered_data_source.cc1
-rw-r--r--webkit/glue/media/media_resource_loader_bridge_factory.cc6
-rw-r--r--webkit/glue/media/media_resource_loader_bridge_factory.h4
-rw-r--r--webkit/glue/media/simple_data_source.cc1
4 files changed, 5 insertions, 7 deletions
diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/glue/media/buffered_data_source.cc
index 5f739ba..5b6ef7e 100644
--- a/webkit/glue/media/buffered_data_source.cc
+++ b/webkit/glue/media/buffered_data_source.cc
@@ -13,7 +13,6 @@
#include "net/base/net_errors.h"
#include "net/http/http_response_headers.h"
#include "webkit/glue/media/buffered_data_source.h"
-#include "webkit/glue/webappcachecontext.h"
namespace {
diff --git a/webkit/glue/media/media_resource_loader_bridge_factory.cc b/webkit/glue/media/media_resource_loader_bridge_factory.cc
index 6e239a4..03684c8 100644
--- a/webkit/glue/media/media_resource_loader_bridge_factory.cc
+++ b/webkit/glue/media/media_resource_loader_bridge_factory.cc
@@ -19,13 +19,13 @@ MediaResourceLoaderBridgeFactory::MediaResourceLoaderBridgeFactory(
const std::string& frame_origin,
const std::string& main_frame_origin,
int origin_pid,
- int app_cache_context_id,
+ int appcache_host_id,
int32 routing_id)
: referrer_(referrer),
frame_origin_(frame_origin),
main_frame_origin_(main_frame_origin),
origin_pid_(origin_pid),
- app_cache_context_id_(app_cache_context_id),
+ appcache_host_id_(appcache_host_id),
routing_id_(routing_id) {
}
@@ -45,7 +45,7 @@ ResourceLoaderBridge* MediaResourceLoaderBridgeFactory::CreateBridge(
load_flags,
origin_pid_,
ResourceType::MEDIA,
- app_cache_context_id_,
+ appcache_host_id_,
routing_id_);
}
diff --git a/webkit/glue/media/media_resource_loader_bridge_factory.h b/webkit/glue/media/media_resource_loader_bridge_factory.h
index 453f655..6408949 100644
--- a/webkit/glue/media/media_resource_loader_bridge_factory.h
+++ b/webkit/glue/media/media_resource_loader_bridge_factory.h
@@ -21,7 +21,7 @@ class MediaResourceLoaderBridgeFactory {
const std::string& frame_origin,
const std::string& main_frame_origin,
int origin_pid,
- int app_cache_context_id,
+ int appcache_host_id,
int32 routing_id);
virtual ~MediaResourceLoaderBridgeFactory() {}
@@ -67,7 +67,7 @@ class MediaResourceLoaderBridgeFactory {
std::string main_frame_origin_;
std::string headers_;
int origin_pid_;
- int app_cache_context_id_;
+ int appcache_host_id_;
int32 routing_id_;
};
diff --git a/webkit/glue/media/simple_data_source.cc b/webkit/glue/media/simple_data_source.cc
index 639aa5f..fd3be2f 100644
--- a/webkit/glue/media/simple_data_source.cc
+++ b/webkit/glue/media/simple_data_source.cc
@@ -10,7 +10,6 @@
#include "net/url_request/url_request_status.h"
#include "webkit/glue/media/simple_data_source.h"
#include "webkit/glue/resource_loader_bridge.h"
-#include "webkit/glue/webappcachecontext.h"
namespace {