Various changes to prevent narrowing conversions: components/

Bug: 1216696
Change-Id: I4752c048151e6e5c35dd886e696f20fa8fb5b54f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2957543
Auto-Submit: Peter Kasting <[email protected]>
Commit-Queue: Ted Choc <[email protected]>
Reviewed-by: Ted Choc <[email protected]>
Cr-Commit-Position: refs/heads/master@{#892623}
diff --git a/components/flags_ui/flags_state.h b/components/flags_ui/flags_state.h
index 6943e77..de21ee52 100644
--- a/components/flags_ui/flags_state.h
+++ b/components/flags_ui/flags_state.h
@@ -158,7 +158,7 @@
   // Returns the value for the current platform. This is one of the values
   // defined by the OS enum above.
   // This is exposed only for testing.
-  static int GetCurrentPlatform();
+  static unsigned short GetCurrentPlatform();
 
  private:
   // Keeps track of affected switches for each FeatureEntry, based on which