base/prefs: Remove the public/ directory and move the files to //base/prefs.

base/base.gyp

 # Copyright (c) 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/win_precompile.gypi',
@@ skipping 327 matching lines @@
       ],
       'sources': [
         'prefs/base_prefs_export.h',
         'prefs/default_pref_store.cc',
         'prefs/default_pref_store.h',
         'prefs/json_pref_store.cc',
         'prefs/json_pref_store.h',
         'prefs/overlay_user_pref_store.cc',
         'prefs/overlay_user_pref_store.h',
         'prefs/persistent_pref_store.h',
+        'prefs/pref_change_registrar.cc',
+        'prefs/pref_change_registrar.h',
+        'prefs/pref_member.cc',
+        'prefs/pref_member.h',
         'prefs/pref_notifier.h',
         'prefs/pref_notifier_impl.cc',
         'prefs/pref_notifier_impl.h',
         'prefs/pref_observer.h',
         'prefs/pref_registry.cc',
         'prefs/pref_registry.h',
         'prefs/pref_registry_simple.cc',
         'prefs/pref_registry_simple.h',
         'prefs/pref_service.cc',
         'prefs/pref_service.h',
         'prefs/pref_service_builder.cc',
         'prefs/pref_service_builder.h',
         'prefs/pref_store.cc',
         'prefs/pref_store.h',
         'prefs/pref_value_map.cc',
         'prefs/pref_value_map.h',
         'prefs/pref_value_store.cc',
         'prefs/pref_value_store.h',
-        'prefs/public/pref_change_registrar.cc',
-        'prefs/public/pref_change_registrar.h',
-        'prefs/public/pref_member.cc',
-        'prefs/public/pref_member.h',
         'prefs/value_map_pref_store.cc',
         'prefs/value_map_pref_store.h',
       ],
     },
     {
       'target_name': 'base_prefs_test_support',
       'type': 'static_library',
       'dependencies': [
         'base',
         'base_prefs',
@@ skipping 144 matching lines @@
         'path_service_unittest.cc',
         'pickle_unittest.cc',
         'platform_file_unittest.cc',
         'posix/file_descriptor_shuffle_unittest.cc',
         'posix/unix_domain_socket_linux_unittest.cc',
         'pr_time_unittest.cc',
         'prefs/default_pref_store_unittest.cc',
         'prefs/json_pref_store_unittest.cc',
         'prefs/mock_pref_change_callback.h',
         'prefs/overlay_user_pref_store_unittest.cc',
+        'prefs/pref_change_registrar_unittest.cc',
+        'prefs/pref_member_unittest.cc',
         'prefs/pref_notifier_impl_unittest.cc',
         'prefs/pref_service_unittest.cc',
         'prefs/pref_value_map_unittest.cc',
         'prefs/pref_value_store_unittest.cc',
-        'prefs/public/pref_change_registrar_unittest.cc',
-        'prefs/public/pref_member_unittest.cc',
         'process_util_unittest.cc',
         'process_util_unittest_ios.cc',
         'process_util_unittest_mac.h',
         'process_util_unittest_mac.mm',
         'profiler/tracked_time_unittest.cc',
         'rand_util_unittest.cc',
         'safe_numerics_unittest.cc',
         'safe_numerics_unittest.nc',
         'scoped_native_library_unittest.cc',
         'scoped_observer.h',
@@ skipping 662 matching lines @@
             'base_unittests.isolate',
           ],
           'sources': [
             'base_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }