Lazy background page branding: "Transient Background Page". Rename

chrome/common/extensions/extension.cc

 // 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.
 
 #include "chrome/common/extensions/extension.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 1368 matching lines @@
       !LoadPlugins(error) ||
       !LoadNaClModules(error) ||
       !LoadWebAccessibleResources(error) ||
       !CheckRequirements(error) ||
       !LoadDefaultLocale(error) ||
       !LoadOfflineEnabled(error) ||
       !LoadOptionsPage(error) ||
       // LoadBackgroundScripts() must be called before LoadBackgroundPage().
       !LoadBackgroundScripts(error) ||
       !LoadBackgroundPage(api_permissions, error) ||
-      !LoadBackgroundPersistent(api_permissions, error) ||
+      !LoadBackgroundTransient(api_permissions, error) ||
       !LoadBackgroundAllowJSAccess(api_permissions, error) ||
       !LoadWebIntentServices(error))
     return false;
 
   return true;
 }
 
 bool Extension::LoadVersion(string16* error) {
   std::string version_str;
   if (!manifest_->GetString(keys::kVersion, &version_str)) {
@@ skipping 392 matching lines @@
       return false;
     }
     background_url_ = bg_page;
   } else {
     background_url_ = GetResourceURL(background_str);
   }
 
   return true;
 }
 
-bool Extension::LoadBackgroundPersistent(
+bool Extension::LoadBackgroundTransient(
     const ExtensionAPIPermissionSet& api_permissions,
     string16* error) {
-  Value* background_persistent = NULL;
+  Value* background_transient = NULL;
   if (!api_permissions.count(ExtensionAPIPermission::kExperimental) ||
-      !manifest_->Get(keys::kBackgroundPersistent, &background_persistent))
+      !manifest_->Get(keys::kBackgroundTransient, &background_transient))
     return true;
 
-  if (!background_persistent->IsType(Value::TYPE_BOOLEAN) ||
-      !background_persistent->GetAsBoolean(&background_page_persists_)) {
-    *error = ASCIIToUTF16(errors::kInvalidBackgroundPersistent);
+  if (!background_transient->IsType(Value::TYPE_BOOLEAN) ||
+      !background_transient->GetAsBoolean(&background_page_is_transient_)) {
+    *error = ASCIIToUTF16(errors::kInvalidBackgroundTransient);
     return false;
   }
 
   if (!has_background_page()) {
-    *error = ASCIIToUTF16(errors::kInvalidBackgroundPersistentNoPage);
+    *error = ASCIIToUTF16(errors::kInvalidBackgroundTransientNoPage);
     return false;
   }
 
   return true;
 }
 
 bool Extension::LoadBackgroundAllowJSAccess(
     const ExtensionAPIPermissionSet& api_permissions,
     string16* error) {
   Value* allow_js_access = NULL;
@@ skipping 897 matching lines @@
   // See http://b/4946060 for more details.
   return id == std::string("nckgahadagoaajjgafhacjanaoiihapd");
 }
 
 Extension::Extension(const FilePath& path,
                      scoped_ptr<extensions::Manifest> manifest)
     : manifest_version_(0),
       incognito_split_mode_(false),
       offline_enabled_(false),
       converted_from_user_script_(false),
-      background_page_persists_(true),
+      background_page_is_transient_(false),
       allow_background_js_access_(true),
       manifest_(manifest.release()),
       is_storage_isolated_(false),
       launch_container_(extension_misc::LAUNCH_TAB),
       launch_width_(0),
       launch_height_(0),
       launch_min_width_(0),
       launch_min_height_(0),
       launch_max_width_(0),
       launch_max_height_(0),
@@ skipping 821 matching lines @@
     already_disabled(false),
     extension(extension) {}
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const ExtensionPermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}