Make the manifest_ member of Extension into a scoped_ptr.

Forwarded declared classes can be used as template parameters.

R=aa@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10836088

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150130 0039d316-1c4b-4281-b951-d872f2087c98

chrome/common/extensions/extension.cc

@@ -1278,7 +1278,7 @@ bool Extension::LoadLaunchContainer(string16* error) {
       launch_container_ == extension_misc::LAUNCH_WINDOW;
 
   // Validate the container width if present.
-  if (!ReadLaunchDimension(manifest_,
+  if (!ReadLaunchDimension(manifest_.get(),
                            keys::kLaunchWidth,
                            &launch_width_,
                            can_specify_initial_size,
@@ -1286,7 +1286,7 @@ bool Extension::LoadLaunchContainer(string16* error) {
       return false;
 
   // Validate container height if present.
-  if (!ReadLaunchDimension(manifest_,
+  if (!ReadLaunchDimension(manifest_.get(),
                            keys::kLaunchHeight,
                            &launch_height_,
                            can_specify_initial_size,
@@ -2912,8 +2912,6 @@ Extension::Extension(const FilePath& path,
 }
 
 Extension::~Extension() {
-  if (manifest_)
-    delete manifest_;
 }
 
 ExtensionResource Extension::GetResource(

chrome/common/extensions/extension.h

@@ -662,7 +662,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   const GURL& update_url() const { return update_url_; }
   const ExtensionIconSet& icons() const { return icons_; }
   const extensions::Manifest* manifest() const {
-    return manifest_;
+    return manifest_.get();
   }
   const std::string default_locale() const { return default_locale_; }
   const URLOverrideMap& GetChromeURLOverrides() const {
@@ -1069,15 +1069,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   GURL update_url_;
 
   // The manifest from which this extension was created.
-  //
-  // NOTE: This is an owned pointer, but can't use scoped_ptr because that would
-  // require manifest.h, which would in turn create a circulate dependency
-  // between extension.h and manifest.h.
-  //
-  // TODO(aa): Pull Extension::Type and Extension::Location out into their own
-  // files so that manifest.h can rely on them and not get all of extension.h
-  // too, and then change this back to a scoped_ptr.
-  extensions::Manifest* manifest_;
+  scoped_ptr<Manifest> manifest_;
 
   // A map of chrome:// hostnames (newtab, downloads, etc.) to Extension URLs
   // which override the handling of those URLs. (see ExtensionOverrideUI).