Revert 133773 - [UMA] Add performance profile data to UMA uploads.

chrome/browser/metrics/metrics_service.h

Index: chrome/browser/metrics/metrics_service.h
===================================================================
--- chrome/browser/metrics/metrics_service.h	(revision 133778)
+++ chrome/browser/metrics/metrics_service.h	(working copy)
@@ -15,14 +15,15 @@
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
+#include "base/memory/weak_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process_util.h"
-#include "chrome/browser/metrics/tracking_synchronizer_observer.h"
 #include "chrome/common/metrics/metrics_service_base.h"
+#include "content/public/common/process_type.h"
+#include "content/public/common/url_fetcher_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "content/public/common/url_fetcher_delegate.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/external_metrics.h"
@@ -30,7 +31,6 @@
 
 class BookmarkModel;
 class BookmarkNode;
-class MetricsLog;
 class MetricsReportingScheduler;
 class PrefService;
 class Profile;
@@ -53,19 +53,14 @@
 bool IsOmniboxEnabled(Profile* profile);
 }
 
-namespace tracked_objects {
-struct ProcessDataSnapshot;
-}
-
 namespace webkit {
 struct WebPluginInfo;
 }
 
-class MetricsService
-    : public chrome_browser_metrics::TrackingSynchronizerObserver,
-      public content::NotificationObserver,
-      public content::URLFetcherDelegate,
-      public MetricsServiceBase {
+
+class MetricsService : public content::NotificationObserver,
+                       public content::URLFetcherDelegate,
+                       public MetricsServiceBase {
  public:
   MetricsService();
   virtual ~MetricsService();
@@ -166,18 +161,11 @@
   // loading plugin information.
   void OnInitTaskGotHardwareClass(const std::string& hardware_class);
 
-  // Callback from PluginService::GetPlugins() that continues the init task by
-  // loading profiler data.
+  // Callback from PluginService::GetPlugins() that moves the state to
+  // INIT_TASK_DONE.
   void OnInitTaskGotPluginInfo(
       const std::vector<webkit::WebPluginInfo>& plugins);
 
-  // TrackingSynchronizerObserver:
-  virtual void ReceivedProfilerData(
-      const tracked_objects::ProcessDataSnapshot& process_data,
-      content::ProcessType process_type) OVERRIDE;
-  // Callback that moves the state to INIT_TASK_DONE.
-  virtual void FinishedReceivingProfilerData() OVERRIDE;
-
   // When we start a new version of Chromium (different from our last run), we
   // need to discard the old crash stats so that we don't attribute crashes etc.
   // in the old version to the current version (via current logs).
@@ -359,9 +347,6 @@
   // The list of plugins which was retrieved on the file thread.
   std::vector<webkit::WebPluginInfo> plugins_;
 
-  // The initial log, used to record startup metrics.
-  scoped_ptr<MetricsLog> initial_log_;
-
   // The outstanding transmission appears as a URL Fetch operation.
   scoped_ptr<content::URLFetcher> current_fetch_xml_;
   scoped_ptr<content::URLFetcher> current_fetch_proto_;