Issue #804: move hook_admin_bar_cache_info() into base modules.

By @docwilmot, @jenlampton, @klonos, and @herbdool.

core/modules/admin_bar/admin_bar.inc

@@ -796,38 +796,6 @@ function admin_bar_admin_bar_cache_info() {
   return $caches;
 }
 
-/**
- * Implements hook_admin_bar_cache_info().
- */
-function system_admin_bar_cache_info() {
-  $caches = array(
-    'assets' => t('CSS and JavaScript'),
-    'cache' => t('Page and else'),
-    'layout' => t('Layout'),
-    'menu' => t('Menu'),
-    'theme' => t('Theme registry'),
-    'token' => t('Token registry'),
-  );
-  foreach ($caches as $name => $cache) {
-    $caches[$name] = array(
-      'title' => $cache,
-      'callback' => '_admin_bar_flush_cache',
-    );
-  }
-  return $caches;
-}
-
-/**
- * Implements hook_admin_bar_cache_info() on behalf of Update module.
- */
-function update_admin_bar_cache_info() {
-  $caches['update'] = array(
-    'title' => t('Update data'),
-    'callback' => '_update_cache_clear',
-  );
-  return $caches;
-}
-
 /**
  * Flush all caches or a specific one.
  *

core/modules/system/system.module

@@ -4174,3 +4174,24 @@ function _system_sort_form_values_by_config($form, &$form_state, $inherited_buck
   }
   return $configs;
 }
+
+/**
+ * Implements hook_admin_bar_cache_info().
+ */
+function system_admin_bar_cache_info() {
+  $caches = array(
+    'assets' => t('CSS and JavaScript'),
+    'cache' => t('Page and else'),
+    'layout' => t('Layout'),
+    'menu' => t('Menu'),
+    'theme' => t('Theme registry'),
+    'token' => t('Token registry'),
+  );
+  foreach ($caches as $name => $cache) {
+    $caches[$name] = array(
+      'title' => $cache,
+      'callback' => '_admin_bar_flush_cache',
+    );
+  }
+  return $caches;
+}

core/modules/update/update.module

@@ -733,6 +733,17 @@ function update_flush_caches() {
   return array();
 }
 
+/**
+ * Implements hook_admin_bar_cache_info().
+ */
+function update_admin_bar_cache_info() {
+  $caches['update'] = array(
+    'title' => t('Update data'),
+    'callback' => '_update_cache_clear',
+  );
+  return $caches;
+}
+
 /**
  * Implements hook_config_info().
  */