Rename the enum constants in WebAppSpecifics to be consistent with other enums

in the sync protocol.

Change-Id: Ic529edcc4588969828605435256d088b666f8eb3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1869512Reviewed-by: Alexey Baskakov <loyso@chromium.org>
Commit-Queue: Tim Schumann <tschumann@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707770}

chrome/browser/web_applications/web_app_database.cc

@@ -329,11 +329,11 @@ std::unique_ptr<WebApp> WebAppDatabase::ParseWebApp(const AppId& app_id,
 blink::mojom::DisplayMode ToMojomDisplayMode(
     ::sync_pb::WebAppSpecifics::DisplayMode display_mode) {
   switch (display_mode) {
-    case ::sync_pb::WebAppSpecifics::kBrowser:
+    case ::sync_pb::WebAppSpecifics::BROWSER:
       return blink::mojom::DisplayMode::kBrowser;
-    case ::sync_pb::WebAppSpecifics::kMinimalUi:
+    case ::sync_pb::WebAppSpecifics::MINIMAL_UI:
       return blink::mojom::DisplayMode::kMinimalUi;
-    case ::sync_pb::WebAppSpecifics::kStandalone:
+    case ::sync_pb::WebAppSpecifics::STANDALONE:
       return blink::mojom::DisplayMode::kStandalone;
   }
 }
@@ -342,16 +342,16 @@ blink::mojom::DisplayMode ToMojomDisplayMode(
     blink::mojom::DisplayMode display_mode) {
   switch (display_mode) {
     case blink::mojom::DisplayMode::kBrowser:
-      return ::sync_pb::WebAppSpecifics::kBrowser;
+      return ::sync_pb::WebAppSpecifics::BROWSER;
     case blink::mojom::DisplayMode::kMinimalUi:
-      return ::sync_pb::WebAppSpecifics::kMinimalUi;
+      return ::sync_pb::WebAppSpecifics::MINIMAL_UI;
     case blink::mojom::DisplayMode::kUndefined:
       NOTREACHED();
       FALLTHROUGH;
     case blink::mojom::DisplayMode::kFullscreen:
     case blink::mojom::DisplayMode::kStandalone:
       // We do not persist kFullscreen - see crbug.com/850465.
-      return ::sync_pb::WebAppSpecifics::kStandalone;
+      return ::sync_pb::WebAppSpecifics::STANDALONE;
   }
 }
 

components/sync/protocol/proto_enum_conversions.cc

@@ -541,12 +541,12 @@ const char* ProtoEnumToString(
 
 const char* ProtoEnumToString(
     sync_pb::WebAppSpecifics::DisplayMode display_mode) {
-  ASSERT_ENUM_BOUNDS(sync_pb::WebAppSpecifics, DisplayMode, kBrowser,
-                     kStandalone);
+  ASSERT_ENUM_BOUNDS(sync_pb::WebAppSpecifics, DisplayMode, BROWSER,
+                     STANDALONE);
   switch (display_mode) {
-    ENUM_CASE(sync_pb::WebAppSpecifics, kBrowser);
-    ENUM_CASE(sync_pb::WebAppSpecifics, kMinimalUi);
-    ENUM_CASE(sync_pb::WebAppSpecifics, kStandalone);
+    ENUM_CASE(sync_pb::WebAppSpecifics, BROWSER);
+    ENUM_CASE(sync_pb::WebAppSpecifics, MINIMAL_UI);
+    ENUM_CASE(sync_pb::WebAppSpecifics, STANDALONE);
   }
   NOTREACHED();
   return "";

components/sync/protocol/web_app_specifics.proto

@@ -17,11 +17,11 @@ message WebAppSpecifics {
   // This enum should be synced with
   // third_party/blink/public/mojom/manifest/display_mode.mojom
   enum DisplayMode {
-    // kUndefined is never serialized.
-    kBrowser = 1;
-    kMinimalUi = 2;
-    kStandalone = 3;
-    // kFullscreen is never serialized.
+    // UNDEFINED is never serialized.
+    BROWSER = 1;
+    MINIMAL_UI = 2;
+    STANDALONE= 3;
+    // FULLSCREEN is never serialized.
   }
 
   optional string launch_url = 1;