Make WebSettings::V8CacheOptions an enum class, fixing -Wshadow warnings

A new version of Clang made the -Wshadow warning also apply to
enumerators, warning that the blink::WebSettings::V8CacheOptions
enumerators shadow the enumerators from blink::V8CacheOptions, e.g.

49344/58815] CXX obj/third_party/blink/renderer/core/core_generated/v8_code_cache.o
In file included from
../../third_party/blink/renderer/bindings/core/v8/v8_code_cache.cc:9:
../../third_party/blink/public/web/web_settings.h:66:5: warning: declaration
shadows a variable in namespace 'blink' [-Wshadow]
    kV8CacheOptionsDefault,
    ^
../../third_party/blink/renderer/bindings/core/v8/v8_cache_options.h:37:3:
note: previous declaration is here
  kV8CacheOptionsDefault,  // Use whatever the current default is.
  ^

Bug: 895475
Change-Id: I6de82855f3db4655c1bfaa4bb8d77fab1466188e
Reviewed-on: https://chromium-review.googlesource.com/c/1282445Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599974}

content/public/common/web_preferences.cc

@@ -27,15 +27,15 @@ STATIC_ASSERT_ENUM(EDITING_BEHAVIOR_ANDROID,
                    WebSettings::kEditingBehaviorAndroid);
 
 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_DEFAULT,
-                   WebSettings::kV8CacheOptionsDefault);
-STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_NONE, WebSettings::kV8CacheOptionsNone);
-STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_CODE, WebSettings::kV8CacheOptionsCode);
+                   WebSettings::V8CacheOptions::kDefault);
+STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_NONE, WebSettings::V8CacheOptions::kNone);
+STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_CODE, WebSettings::V8CacheOptions::kCode);
 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_CODE_WITHOUT_HEAT_CHECK,
-                   WebSettings::kV8CacheOptionsCodeWithoutHeatCheck);
+                   WebSettings::V8CacheOptions::kCodeWithoutHeatCheck);
 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_FULLCODE_WITHOUT_HEAT_CHECK,
-                   WebSettings::kV8CacheOptionsFullCodeWithoutHeatCheck);
+                   WebSettings::V8CacheOptions::kFullCodeWithoutHeatCheck);
 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_LAST,
-                   WebSettings::kV8CacheOptionsFullCodeWithoutHeatCheck);
+                   WebSettings::V8CacheOptions::kFullCodeWithoutHeatCheck);
 
 STATIC_ASSERT_ENUM(SavePreviousDocumentResources::NEVER,
                    WebSettings::SavePreviousDocumentResources::kNever);

content/shell/test_runner/test_runner.cc

@@ -1932,8 +1932,8 @@ void TestRunner::SetV8CacheDisabled(bool disabled) {
     return;
   }
   main_view_->GetSettings()->SetV8CacheOptions(
-      disabled ? blink::WebSettings::kV8CacheOptionsNone
-               : blink::WebSettings::kV8CacheOptionsDefault);
+      disabled ? blink::WebSettings::V8CacheOptions::kNone
+               : blink::WebSettings::V8CacheOptions::kDefault);
 }
 
 void TestRunner::NavigateSecondaryWindow(const GURL& url) {

third_party/blink/public/web/web_embedded_worker_start_data.h

@@ -68,7 +68,7 @@ struct WebEmbeddedWorkerStartData {
   WebEmbeddedWorkerStartData()
       : pause_after_download_mode(kDontPauseAfterDownload),
         wait_for_debugger_mode(kDontWaitForDebugger),
-        v8_cache_options(WebSettings::kV8CacheOptionsDefault) {}
+        v8_cache_options(WebSettings::V8CacheOptions::kDefault) {}
 };
 
 }  // namespace blink

third_party/blink/public/web/web_settings.h

@@ -62,12 +62,12 @@ class WebSettings {
     kEditingBehaviorAndroid
   };
 
-  enum V8CacheOptions {
-    kV8CacheOptionsDefault,
-    kV8CacheOptionsNone,
-    kV8CacheOptionsCode,
-    kV8CacheOptionsCodeWithoutHeatCheck,
-    kV8CacheOptionsFullCodeWithoutHeatCheck
+  enum class V8CacheOptions {
+    kDefault,
+    kNone,
+    kCode,
+    kCodeWithoutHeatCheck,
+    kFullCodeWithoutHeatCheck
   };
 
   enum class SavePreviousDocumentResources {

third_party/blink/renderer/bindings/core/v8/v8_code_cache.cc

@@ -324,12 +324,13 @@ scoped_refptr<CachedMetadata> V8CodeCache::GenerateFullCodeCache(
   return cached_metadata;
 }
 
-STATIC_ASSERT_ENUM(WebSettings::kV8CacheOptionsDefault, kV8CacheOptionsDefault);
-STATIC_ASSERT_ENUM(WebSettings::kV8CacheOptionsNone, kV8CacheOptionsNone);
-STATIC_ASSERT_ENUM(WebSettings::kV8CacheOptionsCode, kV8CacheOptionsCode);
-STATIC_ASSERT_ENUM(WebSettings::kV8CacheOptionsCodeWithoutHeatCheck,
+STATIC_ASSERT_ENUM(WebSettings::V8CacheOptions::kDefault,
+                   kV8CacheOptionsDefault);
+STATIC_ASSERT_ENUM(WebSettings::V8CacheOptions::kNone, kV8CacheOptionsNone);
+STATIC_ASSERT_ENUM(WebSettings::V8CacheOptions::kCode, kV8CacheOptionsCode);
+STATIC_ASSERT_ENUM(WebSettings::V8CacheOptions::kCodeWithoutHeatCheck,
                    kV8CacheOptionsCodeWithoutHeatCheck);
-STATIC_ASSERT_ENUM(WebSettings::kV8CacheOptionsFullCodeWithoutHeatCheck,
+STATIC_ASSERT_ENUM(WebSettings::V8CacheOptions::kFullCodeWithoutHeatCheck,
                    kV8CacheOptionsFullCodeWithoutHeatCheck);
 
 }  // namespace blink

third_party/blink/renderer/modules/service_worker/web_embedded_worker_impl_test.cc

@@ -116,7 +116,7 @@ class WebEmbeddedWorkerImplTest : public testing::Test {
         WebEmbeddedWorkerStartData::kDontPauseAfterDownload;
     start_data_.wait_for_debugger_mode =
         WebEmbeddedWorkerStartData::kDontWaitForDebugger;
-    start_data_.v8_cache_options = WebSettings::kV8CacheOptionsDefault;
+    start_data_.v8_cache_options = WebSettings::V8CacheOptions::kDefault;
   }
 
   void TearDown() override {