Make some global pointers const void* const.

chrome/browser/android/bookmarks/partner_bookmarks_shim.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
 
 #include "base/lazy_instance.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 18 matching lines @@
   scoped_ptr<BookmarkNode> partner_bookmarks_root;
   bool loaded;
 
   PartnerModelKeeper()
     : loaded(false) {}
 };
 
 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
 
 // static
 PartnerBookmarksShim* PartnerBookmarksShim::BuildForBrowserContext(
     content::BrowserContext* browser_context) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   PartnerBookmarksShim* data =
       static_cast<PartnerBookmarksShim*>(
@@ skipping 221 matching lines @@
        i != node_rename_remove_map_.end();
        ++i) {
     base::DictionaryValue* dict = new base::DictionaryValue();
     dict->SetString(kMappingUrl, i->first.url().spec());
     dict->SetString(kMappingProviderTitle, i->first.provider_title());
     dict->SetString(kMappingTitle, i->second);
     list.Append(dict);
   }
   prefs_->Set(prefs::kPartnerBookmarkMappings, list);
 }