Partial revert of "Added metrics to count the number of items in the shelf."

ash/metrics/user_metrics_recorder.cc

 // Copyright 2013 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.
 
 #include "ash/metrics/user_metrics_recorder.h"
 
-#include "ash/shelf/shelf_delegate.h"
-#include "ash/shelf/shelf_item_types.h"
 #include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_state.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/user_metrics.h"
 #include "ui/aura/window.h"
 
 namespace ash {
@@ skipping 96 matching lines @@
            kShellWindowId_AlwaysOnTopContainer == current_container_id) &&
           child_window_state->IsMaximizedOrFullscreen()) {
         maximized_or_fullscreen_window_present = true;
         break;
       }
     }
   }
   return visible_window_count;
 }
 
-void RecordShelfItemCounts() {
-  ShelfDelegate* shelf_delegate = Shell::GetInstance()->GetShelfDelegate();
-  int pinned_item_count = 0;
-  int unpinned_item_count = 0;
-
-  for (const ShelfItem& shelf_item :
-       Shell::GetInstance()->shelf_model()->items()) {
-    if (shelf_item.type != TYPE_APP_LIST) {
-      if (shelf_delegate->IsAppPinned(
-              shelf_delegate->GetAppIDForShelfID(shelf_item.id)))
-        ++pinned_item_count;
-      else
-        ++unpinned_item_count;
-    }
-  }
-
-  UMA_HISTOGRAM_COUNTS_100("Ash.Shelf.NumberOfItems",
-                           pinned_item_count + unpinned_item_count);
-  UMA_HISTOGRAM_COUNTS_100("Ash.Shelf.NumberOfPinnedItems", pinned_item_count);
-  UMA_HISTOGRAM_COUNTS_100("Ash.Shelf.NumberOfUnpinnedItems",
-                           unpinned_item_count);
-}
-
 }  // namespace
 
 UserMetricsRecorder::UserMetricsRecorder() {
   timer_.Start(FROM_HERE,
                base::TimeDelta::FromSeconds(kAshPeriodicMetricsTimeInSeconds),
                this,
                &UserMetricsRecorder::RecordPeriodicMetrics);
 }
 
 UserMetricsRecorder::~UserMetricsRecorder() {
@@ skipping 394 matching lines @@
                                   -1),
                               SHELF_ALIGNMENT_UMA_ENUM_VALUE_COUNT);
   }
 
   UMA_HISTOGRAM_COUNTS_100("Ash.NumberOfVisibleWindowsInPrimaryDisplay",
                            GetNumVisibleWindowsInPrimaryDisplay());
 
   UMA_HISTOGRAM_ENUMERATION("Ash.ActiveWindowShowTypeOverTime",
                             GetActiveWindowState(),
                             ACTIVE_WINDOW_STATE_TYPE_COUNT);
-
-  RecordShelfItemCounts();
 }
 
 }  // namespace ash