Don't send machine and user ID to Omaha anymore. Send a/r pings instead.

update_attempter.h

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_H__
 #define CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_H__
 
 #include <time.h>
 #include <tr1/memory>
 #include <string>
@@ skipping 20 matching lines @@
   UPDATE_STATUS_FINALIZING,
   UPDATE_STATUS_UPDATED_NEED_REBOOT,
   UPDATE_STATUS_REPORTING_ERROR_EVENT,
 };
 
 const char* UpdateStatusToString(UpdateStatus status);
 
 class UpdateAttempter : public ActionProcessorDelegate,
                         public DownloadActionDelegate {
  public:
-  UpdateAttempter(MetricsLibraryInterface* metrics_lib)
+  UpdateAttempter(PrefsInterface* prefs, MetricsLibraryInterface* metrics_lib)
       : dbus_service_(NULL),
+        prefs_(prefs),
         metrics_lib_(metrics_lib),
         status_(UPDATE_STATUS_IDLE),
         download_progress_(0.0),
         last_checked_time_(0),
         new_version_("0.0.0.0"),
         new_size_(0) {
     last_notify_time_.tv_sec = 0;
     last_notify_time_.tv_nsec = 0;
     if (utils::FileExists(kUpdateCompletedMarker))
       status_ = UPDATE_STATUS_UPDATED_NEED_REBOOT;
@@ skipping 60 matching lines @@
   std::vector<std::tr1::shared_ptr<AbstractAction> > actions_;
   ActionProcessor processor_;
 
   // If non-null, this UpdateAttempter will send status updates over this
   // dbus service.
   UpdateEngineService* dbus_service_;
 
   // pointer to the OmahaResponseHandlerAction in the actions_ vector;
   std::tr1::shared_ptr<OmahaResponseHandlerAction> response_handler_action_;
 
+  // Pointer to the preferences store interface.
+  PrefsInterface* prefs_;
+
   // Pointer to the UMA metrics collection library.
   MetricsLibraryInterface* metrics_lib_;
 
   // Pending error event, if any.
   scoped_ptr<OmahaEvent> error_event_;
 
   // For status:
   UpdateStatus status_;
   double download_progress_;
   int64_t last_checked_time_;
   std::string new_version_;
   int64_t new_size_;
 
   // Device paramaters common to all Omaha requests.
   OmahaRequestDeviceParams omaha_request_params_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateAttempter);
 };
 
 }  // namespace chromeos_update_engine
 
 #endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_H__