Make some global pointers const void* const.

content/browser/android/content_view_core_impl.cc

Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 37438d3e472806b5429bad06353a39ddeb2b3d38..d07a149be46dbd3bff784141adcbd032785bf6d5 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -88,7 +88,7 @@ namespace content {
 
 namespace {
 
-const void* kContentViewUserDataKey = &kContentViewUserDataKey;
+const void* const kContentViewUserDataKey = &kContentViewUserDataKey;
 
 int GetRenderProcessIdFromRenderViewHost(RenderViewHost* host) {
   DCHECK(host);
@@ -96,8 +96,7 @@ int GetRenderProcessIdFromRenderViewHost(RenderViewHost* host) {
   DCHECK(render_process);
   if (render_process->HasConnection())
     return render_process->GetHandle();
-  else
-    return 0;
+  return 0;
 }
 
 ScopedJavaLocalRef<jobject> CreateJavaRect(