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 465c5dee253ea8e1555c6b380b8d0b0a7506157c..66d97f4e44b9371dd4562a280dade40d44c85299 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -85,7 +85,7 @@ enum PopupItemType {
   POPUP_ITEM_TYPE_ENABLED,
 };
 
-const void* kContentViewUserDataKey = &kContentViewUserDataKey;
+const void* const kContentViewUserDataKey = &kContentViewUserDataKey;
 
 int GetRenderProcessIdFromRenderViewHost(RenderViewHost* host) {
   DCHECK(host);
@@ -93,8 +93,7 @@ int GetRenderProcessIdFromRenderViewHost(RenderViewHost* host) {
   DCHECK(render_process);
   if (render_process->HasConnection())
     return render_process->GetHandle();
-  else
-    return 0;
+  return 0;
 }
 
 ScopedJavaLocalRef<jobject> CreateJavaRect(