Revert r27589 that broke the tree

TBR=scherkus

Review URL: http://codereview.chromium.org/246043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27590 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 4 insertions, 21 deletions

diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/glue/media/buffered_data_source.cc
index 63a3777..6efaa8c 100644
--- a/webkit/glue/media/buffered_data_source.cc
+++ b/webkit/glue/media/buffered_data_source.cc
@@ -110,12 +110,10 @@ void BufferedResourceLoader::Start(net::CompletionCallback* start_callback) {
 
   // Creates the bridge on render thread since we can only access
   // ResourceDispatcher on this thread.
-  bridge_.reset(
-      bridge_factory_->CreateBridge(
-          url_,
-          IsMediaCacheEnabled() ? net::LOAD_NORMAL : net::LOAD_BYPASS_CACHE,
-          first_byte_position_,
-          last_byte_position_));
+  bridge_.reset(bridge_factory_->CreateBridge(url_,
+                                              net::LOAD_BYPASS_CACHE,
+                                              first_byte_position_,
+                                              last_byte_position_));
 
   // Increment the reference count right before we start the request. This
   // reference will be release when this request has ended.
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index 77289d1..92e62a3 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -479,14 +479,4 @@ int GetGlyphPageCount() {
   return WebCore::GlyphPageTreeNode::treeGlyphPageCount();
 }
 
-bool g_enable_media_cache = false;
-
-bool IsMediaCacheEnabled() {
-  return g_enable_media_cache;
-}
-
-void SetMediaCacheEnabled(bool enabled) {
-  g_enable_media_cache = enabled;
-}
-
 } // namespace webkit_glue
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index 1874510..73fbe6b 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -122,11 +122,6 @@ WebKit::WebCanvas* ToWebCanvas(skia::PlatformCanvas*);
 // used to get memory usage statistics.
 int GetGlyphPageCount();
 
-// Methods to query and enable media cache.
-// TODO(hclam): Remove these methods when the cache is stable enough.
-bool IsMediaCacheEnabled();
-void SetMediaCacheEnabled(bool enabled);
-
 //---- END FUNCTIONS IMPLEMENTED BY WEBKIT/GLUE -------------------------------