Move ChromeContextUtil and PlatformUtil to chrome/browser/util.

These are simple files to move so doing both in the same CL.

Bug: 995916
Change-Id: I67b61f9d3ffea0f66bd493f350f069affea708e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1812117
Commit-Queue: Henrique Nakashima <[email protected]>
Reviewed-by: Peter Wen <[email protected]>
Reviewed-by: Tommy Nyquist <[email protected]>
Cr-Commit-Position: refs/heads/master@{#699995}
diff --git a/chrome/browser/platform_util_android.cc b/chrome/browser/platform_util_android.cc
index 348c191..ddf3da4 100644
--- a/chrome/browser/platform_util_android.cc
+++ b/chrome/browser/platform_util_android.cc
@@ -7,8 +7,8 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
-#include "chrome/android/chrome_jni_headers/PlatformUtil_jni.h"
 #include "chrome/browser/platform_util.h"
+#include "chrome/browser/util/android/jni_headers/PlatformUtil_jni.h"
 #include "ui/android/view_android.h"
 #include "url/gurl.h"