base: Remove discardable memory types.

No need for this. There's only one type.

BUG=442945,422953

Review URL: https://codereview.chromium.org/1002623002

Cr-Commit-Position: refs/heads/master@{#320344}

4 files changed, 0 insertions, 28 deletions

diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 7e63fbe..b377b87 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1311,7 +1311,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     switches::kTestType,
     switches::kTouchEvents,
     switches::kTraceToConsole,
-    switches::kUseDiscardableMemory,
     // This flag needs to be propagated to the renderer process for
     // --in-process-webgl.
     switches::kUseGL,
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index c2fed1e..dc50fb6 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -820,9 +820,6 @@ const char kTraceUploadURL[]                = "trace-upload-url";
 extern const char kUIPrioritizeInGpuProcess[] =
     "ui-prioritize-in-gpu-process";
 
-// Overrides the preferred discardable memory implementation.
-const char kUseDiscardableMemory[] = "use-discardable-memory";
-
 // Bypass the media stream infobar by selecting the default device for media
 // streams (e.g. WebRTC). Works with --use-fake-device-for-media-stream.
 const char kUseFakeUIForMediaStream[]     = "use-fake-ui-for-media-stream";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index 7b40b8d..4c92f4b 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -224,7 +224,6 @@ extern const char kTraceStartupDuration[];
 extern const char kTraceStartupFile[];
 CONTENT_EXPORT extern const char kTraceUploadURL[];
 CONTENT_EXPORT extern const char kUIPrioritizeInGpuProcess[];
-CONTENT_EXPORT extern const char kUseDiscardableMemory[];
 CONTENT_EXPORT extern const char kUseFakeUIForMediaStream[];
 CONTENT_EXPORT extern const char kEnableNativeGpuMemoryBuffers[];
 CONTENT_EXPORT extern const char kUseImageTextureTarget[];
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index cb1e66e..41137e5 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -632,29 +632,6 @@ void RenderThreadImpl::Init() {
   memory_pressure_listener_.reset(new base::MemoryPressureListener(
       base::Bind(&RenderThreadImpl::OnMemoryPressure, base::Unretained(this))));
 
-  std::vector<base::DiscardableMemoryType> supported_types;
-  base::DiscardableMemory::GetSupportedTypes(&supported_types);
-  DCHECK(!supported_types.empty());
-
-  // The default preferred type is always the first one in list.
-  base::DiscardableMemoryType type = supported_types[0];
-
-  if (command_line.HasSwitch(switches::kUseDiscardableMemory)) {
-    std::string requested_type_name = command_line.GetSwitchValueASCII(
-        switches::kUseDiscardableMemory);
-    base::DiscardableMemoryType requested_type =
-        base::DiscardableMemory::GetNamedType(requested_type_name);
-    if (std::find(supported_types.begin(),
-                  supported_types.end(),
-                  requested_type) != supported_types.end()) {
-      type = requested_type;
-    } else {
-      LOG(ERROR) << "Requested discardable memory type is not supported.";
-    }
-  }
-
-  base::DiscardableMemory::SetPreferredType(type);
-
   if (is_impl_side_painting_enabled_) {
     int num_raster_threads = 0;
     std::string string_value =