8 files changed, 2 insertions, 37 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 0abe211..b83ee15 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -286,9 +286,6 @@ ChromeURLRequestContext* FactoryForOriginal::Create() {
                          io_thread_globals->net_log.get(),
                          backend);
 
-  if (command_line.HasSwitch(switches::kDisableByteRangeSupport))
-    cache->set_enable_range_support(false);
-
   bool record_mode = chrome::kRecordModeEnabled &&
                      command_line.HasSwitch(switches::kRecordMode);
   bool playback_mode = command_line.HasSwitch(switches::kPlaybackMode);
@@ -420,10 +417,6 @@ ChromeURLRequestContext* FactoryForOffTheRecord::Create() {
       new ChromeCookiePolicy(host_content_settings_map_));
   context->set_http_transaction_factory(cache);
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableByteRangeSupport))
-    cache->set_enable_range_support(false);
-
   context->set_ftp_transaction_factory(
       new net::FtpNetworkLayer(context->host_resolver()));
 
@@ -512,10 +505,6 @@ ChromeURLRequestContext* FactoryForMedia::Create() {
                                backend);
   }
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableByteRangeSupport))
-    cache->set_enable_range_support(false);
-
   context->set_http_transaction_factory(cache);
   context->set_net_log(io_thread_globals->net_log.get());
 
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index cb451c3..6874758 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -579,7 +579,6 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     switches::kInternalNaCl,
     switches::kInternalPepper,
     switches::kRegisterPepperPlugins,
-    switches::kDisableByteRangeSupport,
     switches::kDisableDatabases,
     switches::kDisableDesktopNotifications,
     switches::kDisableWebSockets,
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 4c45fec..fb84f14 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -144,9 +144,6 @@ const char kDisableBackgroundNetworking[] = "disable-background-networking";
 // users with many windows/tabs and lots of memory.
 const char kDisableBackingStoreLimit[]      = "disable-backing-store-limit";
 
-// Disable support for cached byte-ranges.
-const char kDisableByteRangeSupport[]       = "disable-byte-range-support";
-
 // Disable click-to-play for blocked plug-ins.
 const char kDisableClickToPlay[]            = "disable-click-to-play";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 5e63f1b..1b8c745 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -52,7 +52,6 @@ extern const char kDisableAudio[];
 extern const char kDisableAuthNegotiateCnameLookup[];
 extern const char kDisableBackgroundNetworking[];
 extern const char kDisableBackingStoreLimit[];
-extern const char kDisableByteRangeSupport[];
 extern const char kDisableClickToPlay[];
 extern const char kDisableConnectBackupJobs[];
 extern const char kDisableContentPrefetch[];
diff --git a/chrome/renderer/render_process_impl.cc b/chrome/renderer/render_process_impl.cc
index 735a962..b869461 100644
--- a/chrome/renderer/render_process_impl.cc
+++ b/chrome/renderer/render_process_impl.cc
@@ -171,10 +171,6 @@ RenderProcessImpl::RenderProcessImpl()
   }
 #endif
 
-  if (!command_line.HasSwitch(switches::kDisableByteRangeSupport)) {
-    webkit_glue::SetMediaCacheEnabled(true);
-  }
-
 #if defined(OS_MACOSX)
   FilePath bundle_path = mac_util::MainAppBundlePath();
 
diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/glue/media/buffered_data_source.cc
index f97e7b5..29c86ac 100644
--- a/webkit/glue/media/buffered_data_source.cc
+++ b/webkit/glue/media/buffered_data_source.cc
@@ -127,7 +127,7 @@ void BufferedResourceLoader::Start(net::CompletionCallback* start_callback,
   bridge_.reset(
       bridge_factory_->CreateBridge(
           url_,
-          IsMediaCacheEnabled() ? net::LOAD_NORMAL : net::LOAD_BYPASS_CACHE,
+          net::LOAD_NORMAL,
           first_byte_position_,
           last_byte_position_));
 
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index a58ff1b..c7a7d10 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -422,14 +422,4 @@ int GetGlyphPageCount() {
   return WebGlyphCache::pageCount();
 }
 
-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 b745db4..6cc55b2 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -146,11 +146,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 -------------------------------