Revert rev 69137 due to incorrect change log.

chrome/chrome_browser.gypi

 # Copyright (c) 2010 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': '<(library)',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
@@ skipping 1241 matching lines @@
         'browser/geolocation/empty_device_data_provider.cc',
         'browser/geolocation/empty_device_data_provider.h',
         'browser/geolocation/gateway_data_provider_common.cc',
         'browser/geolocation/gateway_data_provider_common.h',
         'browser/geolocation/gateway_data_provider_linux.cc',
         'browser/geolocation/gateway_data_provider_linux.h',
         'browser/geolocation/gateway_data_provider_win.cc',
         'browser/geolocation/gateway_data_provider_win.h',
         'browser/geolocation/geolocation_content_settings_map.cc',
         'browser/geolocation/geolocation_content_settings_map.h',
-        'browser/geolocation/geolocation_dispatcher_host.cc',
-        'browser/geolocation/geolocation_dispatcher_host.h',
+        'browser/geolocation/geolocation_dispatcher_host_old.cc',
+        'browser/geolocation/geolocation_dispatcher_host_old.h',
         'browser/geolocation/geolocation_exceptions_table_model.cc',
         'browser/geolocation/geolocation_exceptions_table_model.h',
         'browser/geolocation/geolocation_observer.h',
         'browser/geolocation/geolocation_permission_context.cc',
         'browser/geolocation/geolocation_permission_context.h',
         'browser/geolocation/geolocation_prefs.cc',
         'browser/geolocation/geolocation_prefs.h',
         'browser/geolocation/geolocation_provider.cc',
         'browser/geolocation/geolocation_provider.h',
         'browser/geolocation/geolocation_settings_state.cc',
@@ skipping 3068 matching lines @@
             'browser/importer/ie_importer.cc',
           ],
         }],
         [ 'use_openssl==1', {
           'sources!': [
             'browser/importer/nss_decryptor.cc',
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
           ],
         }],
-        # We are migrating to client-based geolocation. Once the migration
-        # has finished, ENABLE_CLIENT_BASED_GEOLOCATION will disappear.
-        # See bugs:
-        #     https://bugs.webkit.org/show_bug.cgi?id=45752 and
-        #     http://code.google.com/p/chromium/issues/detail?id=59907
-        ['"ENABLE_CLIENT_BASED_GEOLOCATION=1" in feature_defines', {
-          'defines': [ 'ENABLE_CLIENT_BASED_GEOLOCATION=1' ]
-        }],
       ],
     },
     {
       # Protobuf compiler / generate rule for feedback
       'target_name': 'userfeedback_proto',
       'type': 'none',
       'sources': [
         'browser/userfeedback/proto/annotations.proto',
         'browser/userfeedback/proto/chrome.proto',
         'browser/userfeedback/proto/common.proto',
@@ skipping 134 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: