Separate WebDataRequest functionality from WebDataService

chrome/browser/api/webdata/web_data_results.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_API_WEBDATA_WEB_DATA_RESULTS_H_
 #define CHROME_BROWSER_API_WEBDATA_WEB_DATA_RESULTS_H_
 
 #include "base/basictypes.h"
+#include "base/callback.h"
+
+class WDTypedResult;
 
 //
 // Result types for WebDataService.
 //
 typedef enum {
   BOOL_RESULT = 1,             // WDResult<bool>
   KEYWORDS_RESULT,             // WDResult<WDKeywordsResult>
   INT64_RESULT,                // WDResult<int64>
 #if defined(OS_WIN)
   PASSWORD_IE7_RESULT,         // WDResult<IE7PasswordInfo>
 #endif
   WEB_APP_IMAGES,              // WDResult<WDAppImagesResult>
   TOKEN_RESULT,                // WDResult<std::vector<std::string>>
   AUTOFILL_VALUE_RESULT,       // WDResult<std::vector<string16>>
   AUTOFILL_CHANGES,            // WDResult<std::vector<AutofillChange>>
   AUTOFILL_PROFILE_RESULT,     // WDResult<AutofillProfile>
   AUTOFILL_PROFILES_RESULT,    // WDResult<std::vector<AutofillProfile*>>
   AUTOFILL_CREDITCARD_RESULT,  // WDResult<CreditCard>
   AUTOFILL_CREDITCARDS_RESULT, // WDResult<std::vector<CreditCard*>>
   WEB_INTENTS_RESULT,          // WDResult<std::vector<WebIntentServiceData>>
   WEB_INTENTS_DEFAULTS_RESULT, // WDResult<std::vector<DefaultWebIntentService>>
 } WDResultType;
 
+
+typedef base::Callback<void(const WDTypedResult*)> DestroyCallback;
+
 //
 // The top level class for a result.
 //
 class WDTypedResult {
  public:
   virtual ~WDTypedResult() {}
 
   // Return the result type.
   WDResultType GetType() const {
     return type_;
   }
 
+  void Destroy() const {
+    if (!callback_.is_null()) {
+      callback_.Run(this);
+    }
+  }
+
  protected:
-  explicit WDTypedResult(WDResultType type) : type_(type) {
+  explicit WDTypedResult(WDResultType type)
+      : type_(type),
+        callback_(DestroyCallback()) {
+  }
+
+  WDTypedResult(WDResultType type, const DestroyCallback& callback)
+      : type_(type),
+        callback_(callback) {
   }
 
  private:
   WDResultType type_;
+  DestroyCallback callback_;
   DISALLOW_COPY_AND_ASSIGN(WDTypedResult);
 };
 
 // A result containing one specific pointer or literal value.
 template <class T> class WDResult : public WDTypedResult {
  public:
+  explicit WDResult(WDResultType type, const T& v)

[dhollowa, 2013/01/07 21:27:13]

nit: omit "explicit", only needed for single-param ctor.

[Cait (Slow), 2013/01/07 22:43:32]

Done.

+      : WDTypedResult(type), value_(v) {
+  }
 
-  WDResult(WDResultType type, const T& v) : WDTypedResult(type), value_(v) {
+  WDResult(WDResultType type, const DestroyCallback& callback, const T& v)
+      : WDTypedResult(type, callback), value_(v) {
   }
 
   virtual ~WDResult() {
   }
 
   // Return a single value result.
   T GetValue() const {
     return value_;
   }
 
  private:
   T value_;
 
   DISALLOW_COPY_AND_ASSIGN(WDResult);
 };
 
 template <class T> class WDObjectResult : public WDTypedResult {
  public:
-  explicit WDObjectResult(WDResultType type) : WDTypedResult(type) {
+  explicit WDObjectResult(WDResultType type)
+    : WDTypedResult(type) {
+  }
+
+  WDObjectResult(WDResultType type, const DestroyCallback& callback)
+    : WDTypedResult(type, callback) {
   }
 
   T* GetValue() const {
     return &value_;
   }
 
  private:
   // mutable to keep GetValue() const.
   mutable T value_;
   DISALLOW_COPY_AND_ASSIGN(WDObjectResult);
 };
 
 #endif  // CHROME_BROWSER_API_WEBDATA_WEB_DATA_RESULTS_H_