Part 4/4 of immutable Extension refactor: Kill Extension::StaticData and put

chrome/common/extensions/extension.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/common/extensions/extension.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/base64.h"
@@ skipping 231 matching lines @@
   Extension::kUnlimitedStoragePermission,
   Extension::kWebstorePrivatePermission,
 };
 const size_t Extension::kNumHostedAppPermissions =
     arraysize(Extension::kHostedAppPermissionNames);
 
 // We purposefully don't put this into kPermissionNames.
 const char Extension::kOldUnlimitedStoragePermission[] = "unlimited_storage";
 
 //
-// Extension::StaticData
-//
-
-Extension::StaticData::StaticData()
-    : incognito_split_mode(false),
-      location(INVALID),
-      converted_from_user_script(false),
-      is_theme(false),
-      is_app(false),
-      launch_container(extension_misc::LAUNCH_TAB),
-      launch_width(0),
-      launch_height(0) {
-}
-
-Extension::StaticData::~StaticData() {
-}
-
-//
 // Extension::RuntimeData
 //
 
 Extension::RuntimeData::RuntimeData()
     : background_page_ready(false),
       being_upgraded(false) {
 }
 
 Extension::RuntimeData::~RuntimeData() {
 }
@@ skipping 507 matching lines @@
        key != source.end_keys(); ++key) {
     if (!IsBaseCrxKey(*key) && *key != keys::kTheme)
       return true;
   }
   return false;
 }
 
 bool Extension::LoadIsApp(const DictionaryValue* manifest,
                           std::string* error) {
   if (manifest->HasKey(keys::kApp))
-    mutable_static_data_->is_app = true;
+    is_app_ = true;
 
   return true;
 }
 
 bool Extension::LoadExtent(const DictionaryValue* manifest,
                            const char* key,
                            ExtensionExtent* extent,
                            const char* list_error,
                            const char* value_error,
                            std::string* error) {
@@ skipping 67 matching lines @@
       return false;
     }
 
     // Ensure the launch path is a valid relative URL.
     GURL resolved = url().Resolve(launch_path);
     if (!resolved.is_valid() || resolved.GetOrigin() != url()) {
       *error = errors::kInvalidLaunchLocalPath;
       return false;
     }
 
-    mutable_static_data_->launch_local_path = launch_path;
+    launch_local_path_ = launch_path;
   } else if (manifest->Get(keys::kLaunchWebURL, &temp)) {
     std::string launch_url;
     if (!temp->GetAsString(&launch_url)) {
       *error = errors::kInvalidLaunchWebURL;
       return false;
     }
 
     // Ensure the launch URL is a valid absolute URL.
     if (!GURL(launch_url).is_valid()) {
       *error = errors::kInvalidLaunchWebURL;
       return false;
     }
 
-    mutable_static_data_->launch_web_url = launch_url;
+    launch_web_url_ = launch_url;
   } else if (is_app()) {
     *error = errors::kLaunchURLRequired;
     return false;
   }
 
   // If there is no extent, we default the extent based on the launch URL.
   if (web_extent().is_empty() && !launch_web_url().empty()) {
     GURL launch_url(launch_web_url());
     URLPattern pattern(kValidWebExtentSchemes);
     if (!pattern.SetScheme("*")) {
       *error = errors::kInvalidLaunchWebURL;
       return false;
     }
     pattern.set_host(launch_url.host());
     pattern.set_path("/*");
-    mutable_static_data_->extent.AddPattern(pattern);
+    extent_.AddPattern(pattern);
   }
 
   // In order for the --apps-gallery-url switch to work with the gallery
   // process isolation, we must insert any provided value into the component
   // app's launch url and web extent.
   if (id() == extension_misc::kWebStoreAppId) {
     GURL gallery_url(CommandLine::ForCurrentProcess()->
         GetSwitchValueASCII(switches::kAppsGalleryURL));
     if (gallery_url.is_valid()) {
-      mutable_static_data_->launch_web_url = gallery_url.spec();
+      launch_web_url_ = gallery_url.spec();
 
       URLPattern pattern(URLPattern::SCHEME_HTTP | URLPattern::SCHEME_HTTPS);
       pattern.Parse(gallery_url.spec());
       pattern.set_path(pattern.path() + '*');
-      mutable_static_data_->extent.AddPattern(pattern);
+      extent_.AddPattern(pattern);
     }
   }
 
   return true;
 }
 
 bool Extension::LoadLaunchContainer(const DictionaryValue* manifest,
                                     std::string* error) {
   Value* temp = NULL;
   if (!manifest->Get(keys::kLaunchContainer, &temp))
     return true;
 
   std::string launch_container_string;
   if (!temp->GetAsString(&launch_container_string)) {
     *error = errors::kInvalidLaunchContainer;
     return false;
   }
 
   if (launch_container_string == values::kLaunchContainerPanel) {
-    mutable_static_data_->launch_container = extension_misc::LAUNCH_PANEL;
+    launch_container_ = extension_misc::LAUNCH_PANEL;
   } else if (launch_container_string == values::kLaunchContainerTab) {
-    mutable_static_data_->launch_container = extension_misc::LAUNCH_TAB;
+    launch_container_ = extension_misc::LAUNCH_TAB;
   } else {
     *error = errors::kInvalidLaunchContainer;
     return false;
   }
 
   // Validate the container width if present.
   if (manifest->Get(keys::kLaunchWidth, &temp)) {
     if (launch_container() != extension_misc::LAUNCH_PANEL &&
         launch_container() != extension_misc::LAUNCH_WINDOW) {
       *error = errors::kInvalidLaunchWidthContainer;
       return false;
     }
-    if (!temp->GetAsInteger(&mutable_static_data_->launch_width) ||
-        mutable_static_data_->launch_width < 0) {
-      mutable_static_data_->launch_width = 0;
+    if (!temp->GetAsInteger(&launch_width_) ||
+        launch_width_ < 0) {
+      launch_width_ = 0;
       *error = errors::kInvalidLaunchWidth;
       return false;
     }
   }
 
   // Validate container height if present.
   if (manifest->Get(keys::kLaunchHeight, &temp)) {
     if (launch_container() != extension_misc::LAUNCH_PANEL &&
         launch_container() != extension_misc::LAUNCH_WINDOW) {
       *error = errors::kInvalidLaunchHeightContainer;
       return false;
     }
-    if (!temp->GetAsInteger(&mutable_static_data_->launch_height) ||
-        mutable_static_data_->launch_height < 0) {
-      mutable_static_data_->launch_height = 0;
+    if (!temp->GetAsInteger(&launch_height_) || launch_height_ < 0) {
+      launch_height_ = 0;
       *error = errors::kInvalidLaunchHeight;
       return false;
     }
   }
 
   return true;
 }
 
 bool Extension::EnsureNotHybridApp(const DictionaryValue* manifest,
                                    std::string* error) {
   if (web_extent().is_empty())
     return true;
 
   for (DictionaryValue::key_iterator key = manifest->begin_keys();
        key != manifest->end_keys(); ++key) {
     if (!IsBaseCrxKey(*key) &&
         *key != keys::kApp &&
         *key != keys::kPermissions &&
         *key != keys::kOptionsPage) {
       *error = errors::kHostedAppsCannotIncludeExtensionFeatures;
       return false;
     }
   }
 
   return true;
 }
 
 Extension::Extension(const FilePath& path, Location location)
-    : mutable_static_data_(new StaticData) {
+    : incognito_split_mode_(false),
+      location_(location),
+      converted_from_user_script_(false),
+      is_theme_(false),
+      is_app_(false),
+      launch_container_(extension_misc::LAUNCH_TAB),
+      launch_width_(0),
+      launch_height_(0) {
   DCHECK(path.IsAbsolute());
-
-  static_data_ = mutable_static_data_;
-  mutable_static_data_->location = location;
-  mutable_static_data_->path = MaybeNormalizePath(path);
+  path_ = MaybeNormalizePath(path);
 }
 
 Extension::~Extension() {
 }
 
 ExtensionResource Extension::GetResource(
     const std::string& relative_path) const {
 #if defined(OS_POSIX)
   FilePath relative_file_path(relative_path);
 #elif defined(OS_WIN)
@@ skipping 177 matching lines @@
   result->swap(decoded);
 }
 
 GURL Extension::GetBaseURLFromExtensionId(const std::string& extension_id) {
   return GURL(std::string(chrome::kExtensionScheme) +
               chrome::kStandardSchemeSeparator + extension_id + "/");
 }
 
 bool Extension::InitFromValue(const DictionaryValue& source, bool require_key,
                               std::string* error) {
-  // Unit tests reuse Extension objects, so we need to reset mutable_static_data
-  // when we re-initialize.
-  mutable_static_data_ = const_cast<StaticData*>(static_data_.get());
-
   if (source.HasKey(keys::kPublicKey)) {
     std::string public_key_bytes;
     if (!source.GetString(keys::kPublicKey,
-                          &mutable_static_data_->public_key) ||
-        !ParsePEMKeyBytes(mutable_static_data_->public_key,
+                          &public_key_) ||
+        !ParsePEMKeyBytes(public_key_,
                           &public_key_bytes) ||
-        !GenerateId(public_key_bytes, &mutable_static_data_->id)) {
+        !GenerateId(public_key_bytes, &id_)) {
       *error = errors::kInvalidKey;
       return false;
     }
   } else if (require_key) {
     *error = errors::kInvalidKey;
     return false;
   } else {
     // If there is a path, we generate the ID from it. This is useful for
     // development mode, because it keeps the ID stable across restarts and
     // reloading the extension.
-    mutable_static_data_->id = Extension::GenerateIdForPath(path());
-    if (mutable_static_data_->id.empty()) {
+    id_ = Extension::GenerateIdForPath(path());
+    if (id_.empty()) {
       NOTREACHED() << "Could not create ID from path.";
       return false;
     }
   }
 
   // Make a copy of the manifest so we can store it in prefs.
-  mutable_static_data_->manifest_value.reset(
+  manifest_value_.reset(
       static_cast<DictionaryValue*>(source.DeepCopy()));
 
   // Initialize the URL.
-  mutable_static_data_->extension_url =
+  extension_url_ =
       Extension::GetBaseURLFromExtensionId(id());
 
   // Initialize version.
   std::string version_str;
   if (!source.GetString(keys::kVersion, &version_str)) {
     *error = errors::kInvalidVersion;
     return false;
   }
-  mutable_static_data_->version.reset(
+  version_.reset(
       Version::GetVersionFromString(version_str));
-  if (!mutable_static_data_->version.get() ||
-      mutable_static_data_->version->components().size() > 4) {
+  if (!version_.get() ||
+      version_->components().size() > 4) {
     *error = errors::kInvalidVersion;
     return false;
   }
 
   // Initialize name.
   string16 localized_name;
   if (!source.GetString(keys::kName, &localized_name)) {
     *error = errors::kInvalidName;
     return false;
   }
   base::i18n::AdjustStringForLocaleDirection(localized_name, &localized_name);
-  mutable_static_data_->name = UTF16ToUTF8(localized_name);
+  name_ = UTF16ToUTF8(localized_name);
 
   // Initialize description (if present).
   if (source.HasKey(keys::kDescription)) {
     if (!source.GetString(keys::kDescription,
-                          &mutable_static_data_->description)) {
+                          &description_)) {
       *error = errors::kInvalidDescription;
       return false;
     }
   }
 
   // Initialize homepage url (if present).
   if (source.HasKey(keys::kHomepageURL)) {
     std::string tmp;
     if (!source.GetString(keys::kHomepageURL, &tmp)) {
       *error = ExtensionErrorUtils::FormatErrorMessage(
           errors::kInvalidHomepageURL, "");
       return false;
     }
-    mutable_static_data_->homepage_url = GURL(tmp);
-    if (!mutable_static_data_->homepage_url.is_valid()) {
+    homepage_url_ = GURL(tmp);
+    if (!homepage_url_.is_valid()) {
       *error = ExtensionErrorUtils::FormatErrorMessage(
           errors::kInvalidHomepageURL, tmp);
       return false;
     }
   }
 
   // Initialize update url (if present).
   if (source.HasKey(keys::kUpdateURL)) {
     std::string tmp;
     if (!source.GetString(keys::kUpdateURL, &tmp)) {
       *error = ExtensionErrorUtils::FormatErrorMessage(
           errors::kInvalidUpdateURL, "");
       return false;
     }
-    mutable_static_data_->update_url = GURL(tmp);
-    if (!mutable_static_data_->update_url.is_valid() ||
-        mutable_static_data_->update_url.has_ref()) {
+    update_url_ = GURL(tmp);
+    if (!update_url_.is_valid() ||
+        update_url_.has_ref()) {
       *error = ExtensionErrorUtils::FormatErrorMessage(
           errors::kInvalidUpdateURL, tmp);
       return false;
     }
   }
 
   // Validate minimum Chrome version (if present). We don't need to store this,
   // since the extension is not valid if it is incorrect.
   if (source.HasKey(keys::kMinimumChromeVersion)) {
     std::string minimum_version_string;
@@ skipping 27 matching lines @@
       *error = ExtensionErrorUtils::FormatErrorMessage(
           errors::kChromeVersionTooLow,
           l10n_util::GetStringUTF8(IDS_PRODUCT_NAME),
           minimum_version_string);
       return false;
     }
   }
 
   // Initialize converted_from_user_script (if present)
   source.GetBoolean(keys::kConvertedFromUserScript,
-                    &mutable_static_data_->converted_from_user_script);
+                    &converted_from_user_script_);
 
   // Initialize icons (if present).
   if (source.HasKey(keys::kIcons)) {
     DictionaryValue* icons_value = NULL;
     if (!source.GetDictionary(keys::kIcons, &icons_value)) {
       *error = errors::kInvalidIcons;
       return false;
     }
 
     for (size_t i = 0; i < arraysize(kIconSizes); ++i) {
       std::string key = base::IntToString(kIconSizes[i]);
       if (icons_value->HasKey(key)) {
         std::string icon_path;
         if (!icons_value->GetString(key, &icon_path)) {
           *error = ExtensionErrorUtils::FormatErrorMessage(
               errors::kInvalidIconPath, key);
           return false;
         }
 
         if (icon_path.size() > 0 && icon_path[0] == '/')
           icon_path = icon_path.substr(1);
 
         if (icon_path.empty()) {
           *error = ExtensionErrorUtils::FormatErrorMessage(
               errors::kInvalidIconPath, key);
           return false;
         }
 
-        mutable_static_data_->icons.Add(kIconSizes[i], icon_path);
+        icons_.Add(kIconSizes[i], icon_path);
       }
     }
   }
 
   // Initialize themes (if present).
-  mutable_static_data_->is_theme = false;
+  is_theme_ = false;
   if (source.HasKey(keys::kTheme)) {
     // Themes cannot contain extension keys.
     if (ContainsNonThemeKeys(source)) {
       *error = errors::kThemesCannotContainExtensions;
       return false;
     }
 
     DictionaryValue* theme_value;
     if (!source.GetDictionary(keys::kTheme, &theme_value)) {
       *error = errors::kInvalidTheme;
       return false;
     }
-    mutable_static_data_->is_theme = true;
+    is_theme_ = true;
 
     DictionaryValue* images_value;
     if (theme_value->GetDictionary(keys::kThemeImages, &images_value)) {
       // Validate that the images are all strings
       for (DictionaryValue::key_iterator iter = images_value->begin_keys();
            iter != images_value->end_keys(); ++iter) {
         std::string val;
         if (!images_value->GetString(*iter, &val)) {
           *error = errors::kInvalidThemeImages;
           return false;
         }
       }
-      mutable_static_data_->theme_images.reset(
+      theme_images_.reset(
           static_cast<DictionaryValue*>(images_value->DeepCopy()));
     }
 
     DictionaryValue* colors_value;
     if (theme_value->GetDictionary(keys::kThemeColors, &colors_value)) {
       // Validate that the colors are RGB or RGBA lists
       for (DictionaryValue::key_iterator iter = colors_value->begin_keys();
            iter != colors_value->end_keys(); ++iter) {
         ListValue* color_list;
         double alpha;
         int alpha_int;
         int color;
         // The color must be a list
         if (!colors_value->GetListWithoutPathExpansion(*iter, &color_list) ||
             // And either 3 items (RGB) or 4 (RGBA)
             ((color_list->GetSize() != 3) &&
              ((color_list->GetSize() != 4) ||
               // For RGBA, the fourth item must be a real or int alpha value
               (!color_list->GetReal(3, &alpha) &&
                !color_list->GetInteger(3, &alpha_int)))) ||
             // For both RGB and RGBA, the first three items must be ints (R,G,B)
             !color_list->GetInteger(0, &color) ||
             !color_list->GetInteger(1, &color) ||
             !color_list->GetInteger(2, &color)) {
           *error = errors::kInvalidThemeColors;
           return false;
         }
       }
-      mutable_static_data_->theme_colors.reset(
+      theme_colors_.reset(
           static_cast<DictionaryValue*>(colors_value->DeepCopy()));
     }
 
     DictionaryValue* tints_value;
     if (theme_value->GetDictionary(keys::kThemeTints, &tints_value)) {
       // Validate that the tints are all reals.
       for (DictionaryValue::key_iterator iter = tints_value->begin_keys();
            iter != tints_value->end_keys(); ++iter) {
         ListValue* tint_list;
         double v;
         int vi;
         if (!tints_value->GetListWithoutPathExpansion(*iter, &tint_list) ||
             tint_list->GetSize() != 3 ||
             !(tint_list->GetReal(0, &v) || tint_list->GetInteger(0, &vi)) ||
             !(tint_list->GetReal(1, &v) || tint_list->GetInteger(1, &vi)) ||
             !(tint_list->GetReal(2, &v) || tint_list->GetInteger(2, &vi))) {
           *error = errors::kInvalidThemeTints;
           return false;
         }
       }
-      mutable_static_data_->theme_tints.reset(
+      theme_tints_.reset(
           static_cast<DictionaryValue*>(tints_value->DeepCopy()));
     }
 
     DictionaryValue* display_properties_value;
     if (theme_value->GetDictionary(keys::kThemeDisplayProperties,
         &display_properties_value)) {
-      mutable_static_data_->theme_display_properties.reset(
+      theme_display_properties_.reset(
           static_cast<DictionaryValue*>(display_properties_value->DeepCopy()));
     }
 
     return true;
   }
 
   // Initialize plugins (optional).
   if (source.HasKey(keys::kPlugins)) {
     ListValue* list_value;
     if (!source.GetList(keys::kPlugins, &list_value)) {
@@ skipping 27 matching lines @@
 
       // Get plugins[i].content (optional).
       if (plugin_value->HasKey(keys::kPluginsPublic)) {
         if (!plugin_value->GetBoolean(keys::kPluginsPublic, &is_public)) {
           *error = ExtensionErrorUtils::FormatErrorMessage(
               errors::kInvalidPluginsPublic, base::IntToString(i));
           return false;
         }
       }
 
-      mutable_static_data_->plugins.push_back(PluginInfo());
-      mutable_static_data_->plugins.back().path = path().AppendASCII(path_str);
-      mutable_static_data_->plugins.back().is_public = is_public;
+      plugins_.push_back(PluginInfo());
+      plugins_.back().path = path().AppendASCII(path_str);
+      plugins_.back().is_public = is_public;
     }
   }
 
   // Initialize background url (optional).
   if (source.HasKey(keys::kBackground)) {
     std::string background_str;
     if (!source.GetString(keys::kBackground, &background_str)) {
       *error = errors::kInvalidBackground;
       return false;
     }
-    mutable_static_data_->background_url = GetResourceURL(background_str);
+    background_url_ = GetResourceURL(background_str);
   }
 
   // Initialize toolstrips.  This is deprecated for public use.
   // NOTE(erikkay) Although deprecated, we intend to preserve this parsing
   // code indefinitely.  Please contact me or Joi for details as to why.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableExperimentalExtensionApis) &&
       source.HasKey(keys::kToolstrips)) {
     ListValue* list_value;
     if (!source.GetList(keys::kToolstrips, &list_value)) {
@@ skipping 14 matching lines @@
           *error = ExtensionErrorUtils::FormatErrorMessage(
               errors::kInvalidToolstrip, base::IntToString(i));
           return false;
         }
         toolstrip = GetResourceURL(toolstrip_path);
       } else {
         *error = ExtensionErrorUtils::FormatErrorMessage(
             errors::kInvalidToolstrip, base::IntToString(i));
         return false;
       }
-      mutable_static_data_->toolstrips.push_back(toolstrip);
+      toolstrips_.push_back(toolstrip);
     }
   }
 
   // Initialize content scripts (optional).
   if (source.HasKey(keys::kContentScripts)) {
     ListValue* list_value;
     if (!source.GetList(keys::kContentScripts, &list_value)) {
       *error = errors::kInvalidContentScriptsList;
       return false;
     }
 
     for (size_t i = 0; i < list_value->GetSize(); ++i) {
       DictionaryValue* content_script;
       if (!list_value->GetDictionary(i, &content_script)) {
         *error = ExtensionErrorUtils::FormatErrorMessage(
             errors::kInvalidContentScript, base::IntToString(i));
         return false;
       }
 
       UserScript script;
       if (!LoadUserScriptHelper(content_script, i, error, &script))
         return false;  // Failed to parse script context definition.
       script.set_extension_id(id());
-      if (mutable_static_data_->converted_from_user_script) {
+      if (converted_from_user_script_) {
         script.set_emulate_greasemonkey(true);
         script.set_match_all_frames(true);  // Greasemonkey matches all frames.
       }
-      mutable_static_data_->content_scripts.push_back(script);
+      content_scripts_.push_back(script);
     }
   }
 
   // Initialize page action (optional).
   DictionaryValue* page_action_value = NULL;
 
   if (source.HasKey(keys::kPageActions)) {
     ListValue* list_value;
     if (!source.GetList(keys::kPageActions, &list_value)) {
       *error = errors::kInvalidPageActionsList;
@@ skipping 16 matching lines @@
     }
   } else if (source.HasKey(keys::kPageAction)) {
     if (!source.GetDictionary(keys::kPageAction, &page_action_value)) {
       *error = errors::kInvalidPageAction;
       return false;
     }
   }
 
   // If page_action_value is not NULL, then there was a valid page action.
   if (page_action_value) {
-    mutable_static_data_->page_action.reset(
+    page_action_.reset(
         LoadExtensionActionHelper(page_action_value, error));
-    if (!mutable_static_data_->page_action.get())
+    if (!page_action_.get())
       return false;  // Failed to parse page action definition.
   }
 
   // Initialize browser action (optional).
   if (source.HasKey(keys::kBrowserAction)) {
     DictionaryValue* browser_action_value;
     if (!source.GetDictionary(keys::kBrowserAction, &browser_action_value)) {
       *error = errors::kInvalidBrowserAction;
       return false;
     }
 
-    mutable_static_data_->browser_action.reset(
+    browser_action_.reset(
         LoadExtensionActionHelper(browser_action_value, error));
-    if (!mutable_static_data_->browser_action.get())
+    if (!browser_action_.get())
       return false;  // Failed to parse browser action definition.
   }
 
   // Load App settings.
-  if (!LoadIsApp(mutable_static_data_->manifest_value.get(), error) ||
-      !LoadExtent(mutable_static_data_->manifest_value.get(), keys::kWebURLs,
-                  &mutable_static_data_->extent,
+  if (!LoadIsApp(manifest_value_.get(), error) ||
+      !LoadExtent(manifest_value_.get(), keys::kWebURLs,
+                  &extent_,
                   errors::kInvalidWebURLs, errors::kInvalidWebURL, error) ||
-      !EnsureNotHybridApp(mutable_static_data_->manifest_value.get(), error) ||
-      !LoadLaunchURL(mutable_static_data_->manifest_value.get(), error) ||
-      !LoadLaunchContainer(mutable_static_data_->manifest_value.get(), error)) {
+      !EnsureNotHybridApp(manifest_value_.get(), error) ||
+      !LoadLaunchURL(manifest_value_.get(), error) ||
+      !LoadLaunchContainer(manifest_value_.get(), error)) {
     return false;
   }
 
   // Initialize options page url (optional).
-  // Funtion LoadIsApp() set mutable_static_data_->is_app above.
+  // Funtion LoadIsApp() set is_app_ above.
   if (source.HasKey(keys::kOptionsPage)) {
     std::string options_str;
     if (!source.GetString(keys::kOptionsPage, &options_str)) {
       *error = errors::kInvalidOptionsPage;
       return false;
     }
 
     if (is_hosted_app()) {
       // hosted apps require an absolute URL.
       GURL options_url(options_str);
       if (!options_url.is_valid() ||
           !(options_url.SchemeIs("http") || options_url.SchemeIs("https"))) {
         *error = errors::kInvalidOptionsPageInHostedApp;
         return false;
       }
-      mutable_static_data_->options_url = options_url;
+      options_url_ = options_url;
 
     } else {
       GURL absolute(options_str);
       if (absolute.is_valid()) {
         *error = errors::kInvalidOptionsPageExpectUrlInPackage;
         return false;
       }
-      mutable_static_data_->options_url = GetResourceURL(options_str);
-      if (!mutable_static_data_->options_url.is_valid()) {
+      options_url_ = GetResourceURL(options_str);
+      if (!options_url_.is_valid()) {
         *error = errors::kInvalidOptionsPage;
         return false;
       }
     }
   }
 
   // Initialize the permissions (optional).
   if (source.HasKey(keys::kPermissions)) {
     ListValue* permissions = NULL;
     if (!source.GetList(keys::kPermissions, &permissions)) {
       *error = ExtensionErrorUtils::FormatErrorMessage(
           errors::kInvalidPermissions, "");
       return false;
     }
 
     for (size_t i = 0; i < permissions->GetSize(); ++i) {
       std::string permission_str;
       if (!permissions->GetString(i, &permission_str)) {
         *error = ExtensionErrorUtils::FormatErrorMessage(
             errors::kInvalidPermission, base::IntToString(i));
         return false;
       }
 
       // Only COMPONENT extensions can use the webstorePrivate APIs.
       // TODO(asargent) - We want a more general purpose mechanism for this,
       // and better error messages. (http://crbug.com/54013)
       if (permission_str == kWebstorePrivatePermission &&
-          mutable_static_data_->location != Extension::COMPONENT) {
+          location_ != Extension::COMPONENT) {
         continue;
       }
 
       // Remap the old unlimited storage permission name.
       if (permission_str == kOldUnlimitedStoragePermission)
         permission_str = kUnlimitedStoragePermission;
 
       if (web_extent().is_empty() || location() == Extension::COMPONENT) {
         // Check if it's a module permission.  If so, enable that permission.
         if (IsAPIPermission(permission_str)) {
-          mutable_static_data_->api_permissions.insert(permission_str);
+          api_permissions_.insert(permission_str);
           continue;
         }
       } else {
         // Hosted apps only get access to a subset of the valid permissions.
         if (IsHostedAppPermission(permission_str)) {
-          mutable_static_data_->api_permissions.insert(permission_str);
+          api_permissions_.insert(permission_str);
           continue;
         }
       }
 
       // Otherwise, it's a host pattern permission.
       URLPattern pattern = URLPattern(CanExecuteScriptEverywhere() ?
           URLPattern::SCHEME_ALL :
           (UserScript::kValidUserScriptSchemes |
               URLPattern::SCHEME_CHROMEUI) & ~URLPattern::SCHEME_FILE);
 
       if (URLPattern::PARSE_SUCCESS != pattern.Parse(permission_str)) {
         *error = ExtensionErrorUtils::FormatErrorMessage(
             errors::kInvalidPermission, base::IntToString(i));
         return false;
       }
 
       if (!CanSpecifyHostPermission(pattern)) {
         *error = ExtensionErrorUtils::FormatErrorMessage(
             errors::kInvalidPermissionScheme, base::IntToString(i));
         return false;
       }
 
       // The path component is not used for host permissions, so we force it to
       // match all paths.
       pattern.set_path("/*");
 
-      mutable_static_data_->host_permissions.push_back(pattern);
+      host_permissions_.push_back(pattern);
     }
   }
 
   if (source.HasKey(keys::kDefaultLocale)) {
     if (!source.GetString(keys::kDefaultLocale,
-                          &mutable_static_data_->default_locale) ||
-        mutable_static_data_->default_locale.empty()) {
+                          &default_locale_) ||
+        default_locale_.empty()) {
       *error = errors::kInvalidDefaultLocale;
       return false;
     }
   }
 
   // Chrome URL overrides (optional)
   if (source.HasKey(keys::kChromeURLOverrides)) {
     DictionaryValue* overrides;
     if (!source.GetDictionary(keys::kChromeURLOverrides, &overrides)) {
       *error = errors::kInvalidChromeURLOverrides;
@@ skipping 10 matching lines @@
 #if defined(TOUCH_UI)
            page != chrome::kChromeUIKeyboardHost &&
 #endif
            page != chrome::kChromeUIBookmarksHost &&
            page != chrome::kChromeUIHistoryHost) ||
           !overrides->GetStringWithoutPathExpansion(*iter, &val)) {
         *error = errors::kInvalidChromeURLOverrides;
         return false;
       }
       // Replace the entry with a fully qualified chrome-extension:// URL.
-      mutable_static_data_->chrome_url_overrides[page] = GetResourceURL(val);
+      chrome_url_overrides_[page] = GetResourceURL(val);
     }
 
     // An extension may override at most one page.
     if (overrides->size() > 1) {
       *error = errors::kMultipleOverrides;
       return false;
     }
   }
 
   if (source.HasKey(keys::kOmniboxKeyword)) {
     if (!source.GetString(keys::kOmniboxKeyword,
-                          &mutable_static_data_->omnibox_keyword) ||
-        mutable_static_data_->omnibox_keyword.empty()) {
+                          &omnibox_keyword_) ||
+        omnibox_keyword_.empty()) {
       *error = errors::kInvalidOmniboxKeyword;
       return false;
     }
     if (!HasApiPermission(Extension::kExperimentalPermission)) {
       *error = errors::kOmniboxExperimental;
       return false;
     }
   }
 
   // Initialize devtools page url (optional).
   if (source.HasKey(keys::kDevToolsPage)) {
     std::string devtools_str;
     if (!source.GetString(keys::kDevToolsPage, &devtools_str)) {
       *error = errors::kInvalidDevToolsPage;
       return false;
     }
     if (!HasApiPermission(Extension::kExperimentalPermission)) {
       *error = errors::kDevToolsExperimental;
       return false;
     }
-    mutable_static_data_->devtools_url = GetResourceURL(devtools_str);
+    devtools_url_ = GetResourceURL(devtools_str);
   }
 
   // Initialize incognito behavior. Apps default to split mode, extensions
   // default to spanning.
-  mutable_static_data_->incognito_split_mode = is_app();
+  incognito_split_mode_ = is_app();
   if (source.HasKey(keys::kIncognito)) {
     std::string value;
     if (!source.GetString(keys::kIncognito, &value)) {
       *error = errors::kInvalidIncognitoBehavior;
       return false;
     }
     if (value == values::kIncognitoSpanning) {
-      mutable_static_data_->incognito_split_mode = false;
+      incognito_split_mode_ = false;
     } else if (value == values::kIncognitoSplit) {
-      mutable_static_data_->incognito_split_mode = true;
+      incognito_split_mode_ = true;
     } else {
       *error = errors::kInvalidIncognitoBehavior;
       return false;
     }
   }
 
   if (HasMultipleUISurfaces()) {
     *error = errors::kOneUISurfaceOnly;
     return false;
   }
 
   InitEffectiveHostPermissions();
 
   // Although |source| is passed in as a const, it's still possible to modify
   // it.  This is dangerous since the utility process re-uses |source| after
   // it calls InitFromValue, passing it up to the browser process which calls
   // InitFromValue again.  As a result, we need to make sure that nobody
   // accidentally modifies it.
-  DCHECK(source.Equals(mutable_static_data_->manifest_value.get()));
-
-  // Ensure we can't modify our static data anymore.
-  mutable_static_data_ = NULL;
+  DCHECK(source.Equals(manifest_value_.get()));
 
   return true;
 }
 
 // static
 std::string Extension::ChromeStoreLaunchURL() {
   std::string gallery_prefix = extension_urls::kGalleryBrowsePrefix;
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppsGalleryURL))
     gallery_prefix = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kAppsGalleryURL);
   if (EndsWith(gallery_prefix, "/", true))
     gallery_prefix = gallery_prefix.substr(0, gallery_prefix.length() - 1);
   return gallery_prefix;
 }
 
 GURL Extension::GetHomepageURL() const {
-  if (static_data_->homepage_url.is_valid())
-    return static_data_->homepage_url;
+  if (homepage_url_.is_valid())
+    return homepage_url_;
 
   if (update_url()!= GURL(extension_urls::kGalleryUpdateHttpsUrl) &&
       update_url()!= GURL(extension_urls::kGalleryUpdateHttpUrl))
     return GURL();
 
   // TODO(erikkay): This may not be entirely correct with the webstore.
   // I think it will have a mixture of /extensions/detail and /webstore/detail
   // URLs.  Perhaps they'll handle this nicely with redirects?
   GURL url(ChromeStoreLaunchURL() + std::string("/detail/") + id());
   return url;
@@ skipping 204 matching lines @@
        host != host_permissions().end(); ++host) {
     if (host->MatchesUrl(url))
       return true;
   }
   return false;
 }
 
 void Extension::InitEffectiveHostPermissions() {
   for (URLPatternList::const_iterator host = host_permissions().begin();
        host != host_permissions().end(); ++host)
-    mutable_static_data_->effective_host_permissions.AddPattern(*host);
+    effective_host_permissions_.AddPattern(*host);
 
   for (UserScriptList::const_iterator content_script =
            content_scripts().begin();
        content_script != content_scripts().end(); ++content_script) {
     UserScript::PatternList::const_iterator pattern =
         content_script->url_patterns().begin();
     for (; pattern != content_script->url_patterns().end(); ++pattern)
-      mutable_static_data_->effective_host_permissions.AddPattern(*pattern);
+      effective_host_permissions_.AddPattern(*pattern);
   }
 }
 
 bool Extension::HasMultipleUISurfaces() const {
   int num_surfaces = 0;
 
   if (page_action())
     ++num_surfaces;
 
   if (browser_action())
@@ skipping 106 matching lines @@
     if (id() == *it) {
       return true;
     }
   }
 
   return false;
 }
 
 Extension::RuntimeData* Extension::GetRuntimeData() const {
   // TODO(mpcomplete): it would be nice if I could verify we were on the UI
   // thread, but we're in common and don't have access to BrowserThread.

[Aaron Boodman, 2010/10/28 00:15:10]

I still think this is kinda wonky and should probably just be pulled out into a
separate object, but we can leave that for a separate project.

If you want to protect this for the time being, you could use the hack from
ExtensionResource -- have a static method that on Extension that sets a
ThreadID, call this from BrowserMain or whatever with the UI thread's ID.

   return const_cast<Extension::RuntimeData*>(&runtime_data_);
 }
 
 ExtensionInfo::ExtensionInfo(const DictionaryValue* manifest,
                              const std::string& id,
                              const FilePath& path,
                              Extension::Location location)
     : extension_id(id),
       extension_path(path),
       extension_location(location) {
   if (manifest)
     extension_manifest.reset(
         static_cast<DictionaryValue*>(manifest->DeepCopy()));
 }
 
 ExtensionInfo::~ExtensionInfo() {}
 
 UninstalledExtensionInfo::UninstalledExtensionInfo(
     const Extension& extension)
     : extension_id(extension.id()),
       extension_api_permissions(extension.api_permissions()),
       is_theme(extension.is_theme()),
       is_app(extension.is_app()),
       converted_from_user_script(extension.converted_from_user_script()),
       update_url(extension.update_url()) {}
 
 UninstalledExtensionInfo::~UninstalledExtensionInfo() {}