Refactored DeviceStatusCollector to enable truely asynchronous status queries

chrome/browser/chromeos/policy/status_uploader.h

 // Copyright (c) 2015 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_STATUS_UPLOADER_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_STATUS_UPLOADER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 93 matching lines @@
   // Callback invoked via a delay to upload device status.
   base::CancelableClosure upload_callback_;
 
   // True if there has been any captured media in this session.
   bool has_captured_media_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<StatusUploader> weak_factory_;
 
-  // Small helper class for state tracking. Necessary because
-  // DeviceStatusCollector has two independent async calls for getting device
-  // and session status, but we need BOTH results before we can upload data.
-  class StatusGetter : public base::RefCountedThreadSafe<StatusGetter> {
-   public:
-    explicit StatusGetter(const base::WeakPtr<StatusUploader>& uploader);
-
-    void OnDeviceStatusReceived(
-        std::unique_ptr<enterprise_management::DeviceStatusReportRequest>
-            device_status);
-    void OnSessionStatusReceived(
-        std::unique_ptr<enterprise_management::SessionStatusReportRequest>
-            session_status);
-
-   private:
-    friend class RefCountedThreadSafe<StatusGetter>;
-    ~StatusGetter();
-
-    void CheckDone();
-
-    std::unique_ptr<enterprise_management::DeviceStatusReportRequest>
-        device_status_;
-    std::unique_ptr<enterprise_management::SessionStatusReportRequest>
-        session_status_;
-
-    base::WeakPtr<StatusUploader> uploader_;
-
-    bool device_status_response_received_;
-    bool session_status_response_received_;
-  };
-
   DISALLOW_COPY_AND_ASSIGN(StatusUploader);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_STATUS_UPLOADER_H_