Make some global pointers const void* const.

chrome/browser/android/bookmarks/partner_bookmarks_shim.cc

Index: chrome/browser/android/bookmarks/partner_bookmarks_shim.cc
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc b/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc
index 5a4d75574e0ddc1b478ca8e2956b9e7f5aa17c7e..8e201ae604c5bb5b405c2d0be7152f0dca05d8ef 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc
@@ -36,15 +36,15 @@ struct PartnerModelKeeper {
 base::LazyInstance<PartnerModelKeeper> g_partner_model_keeper =
     LAZY_INSTANCE_INITIALIZER;
 
-const void* kPartnerBookmarksShimUserDataKey =
+const void* const kPartnerBookmarksShimUserDataKey =
     &kPartnerBookmarksShimUserDataKey;
 
 // Dictionary keys for entries in the kPartnerBookmarksMapping pref.
-static const char kMappingUrl[] = "url";
-static const char kMappingProviderTitle[] = "provider_title";
-static const char kMappingTitle[] = "mapped_title";
+const char kMappingUrl[] = "url";
+const char kMappingProviderTitle[] = "provider_title";
+const char kMappingTitle[] = "mapped_title";
 
-static bool g_disable_partner_bookmarks_editing = false;
+bool g_disable_partner_bookmarks_editing = false;
 
 }  // namespace