Rename "managed (mode|user)" to "supervised user" (part 2)

chrome/chrome_browser.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 1004 matching lines @@
         'browser/mac/keystone_registration.h',
         'browser/mac/keystone_registration.mm',
         'browser/mac/master_prefs.h',
         'browser/mac/master_prefs.mm',
         'browser/mac/obsolete_system.cc',
         'browser/mac/obsolete_system.h',
         'browser/mac/relauncher.cc',
         'browser/mac/relauncher.h',
         'browser/mac/security_wrappers.cc',
         'browser/mac/security_wrappers.h',
-        'browser/managed_mode/custodian_profile_downloader_service.cc',
-        'browser/managed_mode/custodian_profile_downloader_service.h',
-        'browser/managed_mode/custodian_profile_downloader_service_factory.cc',
-        'browser/managed_mode/custodian_profile_downloader_service_factory.h',
-        'browser/managed_mode/managed_mode_interstitial.cc',
-        'browser/managed_mode/managed_mode_interstitial.h',
-        'browser/managed_mode/managed_mode_navigation_observer.cc',
-        'browser/managed_mode/managed_mode_navigation_observer.h',
-        'browser/managed_mode/managed_mode_resource_throttle.cc',
-        'browser/managed_mode/managed_mode_resource_throttle.h',
-        'browser/managed_mode/managed_mode_site_list.cc',
-        'browser/managed_mode/managed_mode_site_list.h',
-        'browser/managed_mode/managed_mode_url_filter.cc',
-        'browser/managed_mode/managed_mode_url_filter.h',
-        'browser/managed_mode/managed_user_constants.cc',
-        'browser/managed_mode/managed_user_constants.h',
-        'browser/managed_mode/managed_user_refresh_token_fetcher.cc',
-        'browser/managed_mode/managed_user_refresh_token_fetcher.h',
-        'browser/managed_mode/managed_user_registration_utility.cc',
-        'browser/managed_mode/managed_user_registration_utility.h',
-        'browser/managed_mode/managed_user_registration_utility_stub.cc',
-        'browser/managed_mode/managed_user_registration_utility_stub.h',
-        'browser/managed_mode/managed_user_settings_service.cc',
-        'browser/managed_mode/managed_user_settings_service.h',
-        'browser/managed_mode/managed_user_settings_service_factory.cc',
-        'browser/managed_mode/managed_user_settings_service_factory.h',
-        'browser/managed_mode/managed_user_service.cc',
-        'browser/managed_mode/managed_user_service.h',
-        'browser/managed_mode/managed_user_service_factory.cc',
-        'browser/managed_mode/managed_user_service_factory.h',
-        'browser/managed_mode/managed_user_shared_settings_service.cc',
-        'browser/managed_mode/managed_user_shared_settings_service.h',
-        'browser/managed_mode/managed_user_shared_settings_service_factory.cc',
-        'browser/managed_mode/managed_user_shared_settings_service_factory.h',
-        'browser/managed_mode/managed_user_shared_settings_update.cc',
-        'browser/managed_mode/managed_user_shared_settings_update.h',
-        'browser/managed_mode/managed_user_sync_service.cc',
-        'browser/managed_mode/managed_user_sync_service.h',
-        'browser/managed_mode/managed_user_sync_service_factory.cc',
-        'browser/managed_mode/managed_user_sync_service_factory.h',
-        'browser/managed_mode/managed_user_sync_service_observer.h',
-        'browser/managed_mode/managed_user_theme.cc',
-        'browser/managed_mode/managed_user_theme.h',
-        'browser/managed_mode/managed_users.h',
-        'browser/managed_mode/permission_request_creator.h',
-        'browser/managed_mode/permission_request_creator_apiary.cc',
-        'browser/managed_mode/permission_request_creator_apiary.h',
-        'browser/managed_mode/permission_request_creator_sync.cc',
-        'browser/managed_mode/permission_request_creator_sync.h',
-        'browser/managed_mode/supervised_user_pref_mapping_service.cc',
-        'browser/managed_mode/supervised_user_pref_mapping_service.h',
-        'browser/managed_mode/supervised_user_pref_mapping_service_factory.cc',
-        'browser/managed_mode/supervised_user_pref_mapping_service_factory.h',
-        'browser/managed_mode/supervised_user_pref_store.cc',
-        'browser/managed_mode/supervised_user_pref_store.h',
         'browser/media/audio_stream_monitor.cc',
         'browser/media/audio_stream_monitor.h',
         'browser/media/cast_transport_host_filter.cc',
         'browser/media/cast_transport_host_filter.h',
         'browser/media/desktop_media_list.h',
         'browser/media/desktop_media_list_ash.cc',
         'browser/media/desktop_media_list_ash.h',
         'browser/media/desktop_media_picker.h',
         'browser/media/desktop_streams_registry.cc',
         'browser/media/desktop_streams_registry.h',
@@ skipping 1098 matching lines @@
         'browser/ssl/ssl_error_info.h',
         'browser/status_icons/desktop_notification_balloon.cc',
         'browser/status_icons/desktop_notification_balloon.h',
         'browser/status_icons/status_icon.cc',
         'browser/status_icons/status_icon.h',
         'browser/status_icons/status_icon_menu_model.cc',
         'browser/status_icons/status_icon_menu_model.h',
         'browser/status_icons/status_icon_observer.h',
         'browser/status_icons/status_tray.cc',
         'browser/status_icons/status_tray.h',
+        'browser/supervised_user/custodian_profile_downloader_service.cc',
+        'browser/supervised_user/custodian_profile_downloader_service.h',
+        'browser/supervised_user/custodian_profile_downloader_service_factory.cc',
+        'browser/supervised_user/custodian_profile_downloader_service_factory.h',
+        'browser/supervised_user/permission_request_creator.h',
+        'browser/supervised_user/permission_request_creator_apiary.cc',
+        'browser/supervised_user/permission_request_creator_apiary.h',
+        'browser/supervised_user/permission_request_creator_sync.cc',
+        'browser/supervised_user/permission_request_creator_sync.h',
+        'browser/supervised_user/supervised_user_constants.cc',
+        'browser/supervised_user/supervised_user_constants.h',
+        'browser/supervised_user/supervised_user_interstitial.cc',
+        'browser/supervised_user/supervised_user_interstitial.h',
+        'browser/supervised_user/supervised_user_navigation_observer.cc',
+        'browser/supervised_user/supervised_user_navigation_observer.h',
+        'browser/supervised_user/supervised_user_pref_mapping_service.cc',
+        'browser/supervised_user/supervised_user_pref_mapping_service.h',
+        'browser/supervised_user/supervised_user_pref_mapping_service_factory.cc',
+        'browser/supervised_user/supervised_user_pref_mapping_service_factory.h',
+        'browser/supervised_user/supervised_user_pref_store.cc',
+        'browser/supervised_user/supervised_user_pref_store.h',
+        'browser/supervised_user/supervised_user_refresh_token_fetcher.cc',
+        'browser/supervised_user/supervised_user_refresh_token_fetcher.h',
+        'browser/supervised_user/supervised_user_registration_utility.cc',
+        'browser/supervised_user/supervised_user_registration_utility.h',
+        'browser/supervised_user/supervised_user_registration_utility_stub.cc',
+        'browser/supervised_user/supervised_user_registration_utility_stub.h',
+        'browser/supervised_user/supervised_user_resource_throttle.cc',
+        'browser/supervised_user/supervised_user_resource_throttle.h',
+        'browser/supervised_user/supervised_user_service.cc',
+        'browser/supervised_user/supervised_user_service.h',
+        'browser/supervised_user/supervised_user_service_factory.cc',
+        'browser/supervised_user/supervised_user_service_factory.h',
+        'browser/supervised_user/supervised_user_settings_service.cc',
+        'browser/supervised_user/supervised_user_settings_service.h',
+        'browser/supervised_user/supervised_user_settings_service_factory.cc',
+        'browser/supervised_user/supervised_user_settings_service_factory.h',
+        'browser/supervised_user/supervised_user_shared_settings_service.cc',
+        'browser/supervised_user/supervised_user_shared_settings_service.h',
+        'browser/supervised_user/supervised_user_shared_settings_service_factory.cc',
+        'browser/supervised_user/supervised_user_shared_settings_service_factory.h',
+        'browser/supervised_user/supervised_user_shared_settings_update.cc',
+        'browser/supervised_user/supervised_user_shared_settings_update.h',
+        'browser/supervised_user/supervised_user_site_list.cc',
+        'browser/supervised_user/supervised_user_site_list.h',
+        'browser/supervised_user/supervised_user_sync_service.cc',
+        'browser/supervised_user/supervised_user_sync_service.h',
+        'browser/supervised_user/supervised_user_sync_service_factory.cc',
+        'browser/supervised_user/supervised_user_sync_service_factory.h',
+        'browser/supervised_user/supervised_user_sync_service_observer.h',
+        'browser/supervised_user/supervised_user_theme.cc',
+        'browser/supervised_user/supervised_user_theme.h',
+        'browser/supervised_user/supervised_user_url_filter.cc',
+        'browser/supervised_user/supervised_user_url_filter.h',
+        'browser/supervised_user/supervised_users.h',
         'browser/sxs_linux.cc',
         'browser/sxs_linux.h',
         'browser/sync/about_sync_util.cc',
         'browser/sync/about_sync_util.h',
         'browser/sync/backend_migrator.cc',
         'browser/sync/backend_migrator.h',
         'browser/sync/backend_unrecoverable_error_handler.cc',
         'browser/sync/backend_unrecoverable_error_handler.h',
         'browser/sync/backup_rollback_controller.cc',
         'browser/sync/backup_rollback_controller.h',
@@ skipping 1255 matching lines @@
             'browser/plugins/plugins_resource_service.h',
           ],
         }],
         ['enable_app_list==1', {
           'dependencies': [
             '../ui/app_list/app_list.gyp:app_list',
           ]
         }],
         ['enable_managed_users!=1', {
           'sources/': [
-            ['exclude', '^browser/managed_mode/'],
+            ['exclude', '^browser/supervised_user/'],
           ],
         }],
         ['enable_webrtc==0', {
           'sources!': [
             'browser/media/webrtc_log_upload_list.cc',
             'browser/media/webrtc_log_upload_list.h',
             'browser/media/webrtc_log_uploader.cc',
             'browser/media/webrtc_log_uploader.h',
             'browser/media/webrtc_log_util.cc',
             'browser/media/webrtc_log_util.h',
@@ skipping 310 matching lines @@
             'package_name': 'org/chromium/chrome/browser',
             'template_deps': ['browser/android/tab_load_status.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }