Dispatch geolocation IPCs on the UI thread. Aside from simplifying the code to avoid a lot of threa…

chrome/browser/chromeos/policy/device_status_collector.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/callback_forward.h"
+#include "base/callback_list.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/version_loader.h"
 #include "chrome/browser/idle.h"
@@ skipping 64 matching lines @@
   // The number of days in the past to store device activity.
   // This is kept in case device status uploads fail for a number of days.
   unsigned int max_stored_past_activity_days_;
 
   // The number of days in the future to store device activity.
   // When changing the system time and/or timezones, it's possible to record
   // activity time that is slightly in the future.
   unsigned int max_stored_future_activity_days_;
 
  private:
-  // A helper class to manage receiving geolocation callbacks on the IO
-  // thread.
-  class Context : public base::RefCountedThreadSafe<Context> {
-   public:
-    Context();
-
-    void GetLocationUpdate(
-        const content::GeolocationProvider::LocationUpdateCallback& callback);
-
-   private:
-    friend class base::RefCountedThreadSafe<Context>;
-
-    ~Context();
-
-    void GetLocationUpdateInternal();
-    void OnLocationUpdate(const content::Geoposition& geoposition);
-    void CallCollector(const content::Geoposition& geoposition);
-
-    // The callback which this class registers with
-    // content::GeolocationProvider.
-    content::GeolocationProvider::LocationUpdateCallback our_callback_;
-
-    // The callback passed in to GetLocationUpdate.
-    content::GeolocationProvider::LocationUpdateCallback owner_callback_;
-  };
-
   // Prevents the local store of activity periods from growing too large by
   // removing entries that are outside the reporting window.
   void PruneStoredActivityPeriods(base::Time base_time);
 
   // Trims the store activity periods to only retain data within the
   // [|min_day_key|, |max_day_key|). The record for |min_day_key| will be
   // adjusted by subtracting |min_day_trim_duration|.
   void TrimStoredActivityPeriods(int64 min_day_key,
                                  int min_day_trim_duration,
                                  int64 max_day_key);
@@ skipping 58 matching lines @@
   chromeos::system::StatisticsProvider* statistics_provider_;
 
   chromeos::CrosSettings* cros_settings_;
 
   base::WeakPtrFactory<DeviceStatusCollector> weak_factory_;
 
   // TODO(bartfab): Remove this once crbug.com/125931 is addressed and a proper
   // way to mock geolocation exists.
   LocationUpdateRequester location_update_requester_;
 
+  scoped_ptr<content::GeolocationProvider::Subscription>
+      geolocation_subscription_;
+
   // Cached values of the reporting settings from the device policy.
   bool report_version_info_;
   bool report_activity_times_;
   bool report_boot_mode_;
   bool report_location_;
   bool report_network_interfaces_;
   bool report_users_;
 
-  scoped_refptr<Context> context_;
-
   scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
       version_info_subscription_;
   scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
       activity_times_subscription_;
   scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
       boot_mode_subscription_;
   scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
       location_subscription_;
   scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
       network_interfaces_subscription_;
   scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
       users_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_