Fix WebDataRequest ownership gap

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"
 
@@ skipping 22 matching lines @@
 } WDResultType;
 
 
 typedef base::Callback<void(const WDTypedResult*)> DestroyCallback;
 
 //
 // The top level class for a result.
 //
 class WDTypedResult {
  public:
-  virtual ~WDTypedResult();
+  virtual ~WDTypedResult() {
+  }
 
   // Return the result type.
   WDResultType GetType() const {
     return type_;
   }
 
-  void Destroy() const {
-    if (!callback_.is_null()) {
-      callback_.Run(this);
-    }
+  virtual void Destroy() {
   }
 
  protected:
-  explicit WDTypedResult(WDResultType type);
-
-  WDTypedResult(WDResultType type, const DestroyCallback& callback);
+  explicit WDTypedResult(WDResultType type)
+    : type_(type) {
+  }
 
  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:
   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 WDDestroyableResult : public WDTypedResult {
+ public:
+  WDDestroyableResult(WDResultType type, const T& v,
+      const DestroyCallback& callback)

[erikwright (departed), 2013/01/28 20:01:05]

indentation.

[Cait (Slow), 2013/01/29 01:10:29]

Done.

+      : WDTypedResult(type), value_(v), callback_(callback) {
+  }
+
+  virtual ~WDDestroyableResult() {
+  }
+
+
+  virtual void Destroy()  OVERRIDE {
+    if (!callback_.is_null()) {
+      callback_.Run(this);
+    }
+  }
+
+  // Return a single value result.
+  T GetValue() const {
+    return value_;
+  }
+
+ private:
+  T value_;
+  DestroyCallback callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(WDDestroyableResult);
+};
+
 template <class T> class WDObjectResult : public WDTypedResult {
  public:
   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_