Make ChromeGeolocationPermissionContextFactory a ProfileKeyedServiceFactory

chrome/browser/prefs/browser_prefs.cc

 // Copyright 2012 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/prefs/browser_prefs.h"
 
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/background/background_mode_manager.h"
@@ skipping 250 matching lines @@
   web_intents::RegisterUserPrefs(user_prefs);
 #endif
 
 #if defined(TOOLKIT_VIEWS)
   RegisterInvertBubbleUserPrefs(user_prefs);
 #elif defined(TOOLKIT_GTK)
   BrowserWindowGtk::RegisterUserPrefs(user_prefs);
 #endif
 
 #if defined(OS_ANDROID)
-  geolocation::RegisterUserPrefs(user_prefs);
   PromoHandler::RegisterUserPrefs(user_prefs);
 #endif
 
 #if defined(USE_ASH)
   ash::RegisterChromeLauncherUserPrefs(user_prefs);
 #endif
 
 #if !defined(OS_ANDROID)
   CaptureVisibleTabFunction::RegisterUserPrefs(user_prefs);
   ChromeToMobileService::RegisterUserPrefs(user_prefs);
@@ skipping 94 matching lines @@
     }
     local_state->ClearPref(prefs::kLastPromptedGoogleURL);
 
     current_version |= GOOGLE_URL_TRACKER_PREFS;
     local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
                             current_version);
   }
 }
 
 }  // namespace chrome