Cleanup: Remove experimental V8 cache strategies that we discarded.

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 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.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 1046 matching lines @@
   settings->setViewportMetaEnabled(prefs.viewport_meta_enabled);
   settings->setMainFrameResizesAreOrientationChanges(
       prefs.main_frame_resizes_are_orientation_changes);
 
   settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled);
 
   settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled);
 
   settings->setSelectionIncludesAltImageText(true);
 
+// This change has both Chrome + blink components. The #if-guard allows us
+// to do this in two steps.
+#ifdef CLEANUP_V8_CACHE_OPTIONS_GUARD
+  // Proper solution:
   settings->setV8CacheOptions(
       static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options));
+#else
+  // Temporary solution, while not all changes are in:
+  switch (prefs.v8_cache_options) {
+    case V8_CACHE_OPTIONS_DEFAULT:
+      settings->setV8CacheOptions(WebSettings::V8CacheOptionsDefault);
+      break;
+    case V8_CACHE_OPTIONS_NONE:
+      settings->setV8CacheOptions(WebSettings::V8CacheOptionsNone);
+      break;
+    case V8_CACHE_OPTIONS_PARSE:
+      settings->setV8CacheOptions(WebSettings::V8CacheOptionsParseMemory);
+      break;
+    case V8_CACHE_OPTIONS_CODE:
+      settings->setV8CacheOptions(WebSettings::V8CacheOptionsHeuristics);
+      break;
+  }
+#endif  // CLEANUP_V8_CACHE_OPTIONS_GUARD
 
   settings->setImageAnimationPolicy(
       static_cast<WebSettings::ImageAnimationPolicy>(prefs.animation_policy));
 
   // Needs to happen before setIgnoreVIewportTagScaleLimits below.
   web_view->setDefaultPageScaleLimits(
       prefs.default_minimum_page_scale_factor,
       prefs.default_maximum_page_scale_factor);
 
 #if defined(OS_ANDROID)
@@ skipping 2699 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content