Event page rebranding: "transient" key is now "persistent" again.

chrome/common/extensions/extension.cc

Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 521628f312158a5c28ae2aae8f1f19ef006e4718..df36a4bf9c1c97500a35ae294b859462e7f384e2 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -1444,7 +1444,7 @@ bool Extension::LoadSharedFeatures(
       // LoadBackgroundScripts() must be called before LoadBackgroundPage().
       !LoadBackgroundScripts(error) ||
       !LoadBackgroundPage(api_permissions, error) ||
-      !LoadBackgroundTransient(api_permissions, error) ||
+      !LoadBackgroundPersistent(api_permissions, error) ||
       !LoadBackgroundAllowJSAccess(api_permissions, error) ||
       !LoadWebIntentServices(error))
     return false;
@@ -1866,22 +1866,22 @@ bool Extension::LoadBackgroundPage(
   return true;
 }
 
-bool Extension::LoadBackgroundTransient(
+bool Extension::LoadBackgroundPersistent(
     const ExtensionAPIPermissionSet& api_permissions,
     string16* error) {
-  Value* background_transient = NULL;
+  Value* background_persistent = NULL;
   if (!api_permissions.count(ExtensionAPIPermission::kExperimental) ||
-      !manifest_->Get(keys::kBackgroundTransient, &background_transient))
+      !manifest_->Get(keys::kBackgroundPersistent, &background_persistent))
     return true;
 
-  if (!background_transient->IsType(Value::TYPE_BOOLEAN) ||
-      !background_transient->GetAsBoolean(&background_page_is_transient_)) {
-    *error = ASCIIToUTF16(errors::kInvalidBackgroundTransient);
+  if (!background_persistent->IsType(Value::TYPE_BOOLEAN) ||
+      !background_persistent->GetAsBoolean(&background_page_is_persistent_)) {
+    *error = ASCIIToUTF16(errors::kInvalidBackgroundPersistent);
     return false;
   }
 
   if (!has_background_page()) {
-    *error = ASCIIToUTF16(errors::kInvalidBackgroundTransientNoPage);
+    *error = ASCIIToUTF16(errors::kInvalidBackgroundPersistentNoPage);
     return false;
   }
 
@@ -2805,7 +2805,7 @@ Extension::Extension(const FilePath& path,
       incognito_split_mode_(false),
       offline_enabled_(false),
       converted_from_user_script_(false),
-      background_page_is_transient_(false),
+      background_page_is_persistent_(true),
       allow_background_js_access_(true),
       manifest_(manifest.release()),
       is_storage_isolated_(false),