commit 18ae25a220fce771913a805bdc53b8eafefd0eb9
Author: Chris Leppanen <chris.leppanen@gmail.com>
Date:   Thu Apr 4 02:49:07 2013 -0700

    15266-new_changes

diff --git a/core/modules/aggregator/aggregator.admin.inc b/core/modules/aggregator/aggregator.admin.inc
index 79c90ea..040dafe 100644
--- a/core/modules/aggregator/aggregator.admin.inc
+++ b/core/modules/aggregator/aggregator.admin.inc
@@ -70,7 +70,7 @@ function aggregator_view() {
     $categories = entity_load_multiple_by_properties('taxonomy_term', array('vid' => 'aggregator_categories'));
 
     // Get the number of items in each category.
-    $counts = entity_query_aggregate('aggregator_item')
+    $counts = Drupal::service('entity.query')->getAggregate('aggregator_item')
       ->aggregate('field_aggregator_categories.target_id', 'COUNT')
       ->groupBy('field_aggregator_categories.target_id')
       ->execute();
@@ -228,7 +228,7 @@ function aggregator_form_opml_submit($form, &$form_state) {
     }
 
     // Check for duplicate titles or URLs.
-    $query = entity_query('aggregator_feed');
+    $query = Drupal::entityQuery('aggregator_feed');
     $group = $query->orConditionGroup()
       ->condition('title', $feed['title'])
       ->condition('url', $feed['url']);
diff --git a/core/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc
index 0b4db62..1b64dfd 100644
--- a/core/modules/aggregator/aggregator.pages.inc
+++ b/core/modules/aggregator/aggregator.pages.inc
@@ -118,7 +118,7 @@ function aggregator_page_category_form($form, $form_state, $category) {
  */
 function aggregator_load_feed_items($type, $data = NULL, $limit = 20) {
   $items = array();
-  $query = entity_query('aggregator_item');
+  $query = Drupal::entityQuery('aggregator_item');
   switch ($type) {
     case 'source':
       $query->condition('fid', $data->id());
@@ -444,7 +444,7 @@ function theme_aggregator_page_rss($variables) {
  * @see aggregator_menu()
  */
 function aggregator_page_opml($tid = NULL) {
-  $query = entity_query('aggregator_feed');
+  $query = Drupal::entityQuery('aggregator_feed');
   if ($tid) {
     $query->condition('field_aggregator_categories.target_id', $tid);
   }
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/FeedFormController.php b/core/modules/aggregator/lib/Drupal/aggregator/FeedFormController.php
index 1872b4f..1d98aa1 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/FeedFormController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/FeedFormController.php
@@ -68,7 +68,7 @@ public function form(array $form, array &$form_state, EntityInterface $feed) {
   public function validate(array $form, array &$form_state) {
     $feed = $this->buildEntity($form, $form_state);
     // Check for duplicate titles.
-    $query = entity_query('aggregator_feed');
+    $query = Drupal::entityQuery('aggregator_feed');
 
     $group = $query->orConditionGroup()
       ->condition('title', $feed->label())
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorCategoryBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorCategoryBlock.php
index ac0b50f..d8fb8d0 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorCategoryBlock.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorCategoryBlock.php
@@ -67,7 +67,7 @@ public function blockSubmit($form, &$form_state) {
   public function build() {
     $id = $this->getPluginId();
     if ($category = taxonomy_term_load($id)) {
-      $result = entity_query('aggregator_item')
+      $result = Drupal::entityQuery('aggregator_item')
         ->condition('field_aggregator_categories.target_id', $id)
         ->range(0, $this->configuration['block_count'])
         ->execute();