Move "oauth2" manifest key parsing out of Extension class.

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 <ostream>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 325 matching lines @@
     UserScript::kValidUserScriptSchemes | URLPattern::SCHEME_CHROMEUI;
 
 Extension::Requirements::Requirements()
     : webgl(false),
       css3d(false),
       npapi(false) {
 }
 
 Extension::Requirements::~Requirements() {}
 
-Extension::OAuth2Info::OAuth2Info() {}
-Extension::OAuth2Info::~OAuth2Info() {}
-
 Extension::ActionInfo::ActionInfo() {}
 Extension::ActionInfo::~ActionInfo() {}
 
 Extension::FileHandlerInfo::FileHandlerInfo() {}
 Extension::FileHandlerInfo::~FileHandlerInfo() {}
 
 //
 // Extension
 //
 
@@ skipping 1623 matching lines @@
       !LoadSandboxedPages(error) ||
       !LoadRequirements(error) ||
       !LoadDefaultLocale(error) ||
       !LoadOfflineEnabled(error) ||
       !LoadOptionsPage(error) ||
       // LoadBackgroundScripts() must be called before LoadBackgroundPage().
       !LoadBackgroundScripts(error) ||
       !LoadBackgroundPage(api_permissions, error) ||
       !LoadBackgroundPersistent(api_permissions, error) ||
       !LoadBackgroundAllowJSAccess(api_permissions, error) ||
-      !LoadWebIntentServices(error) ||
-      !LoadOAuth2Info(error))
+      !LoadWebIntentServices(error))
     return false;
 
   return true;
 }
 
 bool Extension::LoadDescription(string16* error) {
   if (manifest_->HasKey(keys::kDescription) &&
       !manifest_->GetString(keys::kDescription, &description_)) {
     *error = ASCIIToUTF16(errors::kInvalidDescription);
     return false;
@@ skipping 837 matching lines @@
       !LoadContentSecurityPolicy(error))
     return false;
 
   return true;
 }
 
 bool Extension::LoadManifestHandlerFeatures(string16* error) {
   std::vector<std::string> keys = ManifestHandler::GetKeys();
   for (size_t i = 0; i < keys.size(); ++i) {
     Value* value = NULL;
-    if (!manifest_->Get(keys[i], &value))
-      continue;
-    if (!ManifestHandler::Get(keys[i])->Parse(value, this, error))
+    if (!manifest_->Get(keys[i], &value)) {
+      if (!ManifestHandler::Get(keys[i])->HasNoKey(this, error))
+        return false;
+    } else if (!ManifestHandler::Get(keys[i])->Parse(value, this, error)) {
       return false;
+    }
   }
   return true;
 }
 
 bool Extension::LoadDevToolsPage(string16* error) {
   if (!manifest_->HasKey(keys::kDevToolsPage))
     return true;
   std::string devtools_str;
   if (!manifest_->GetString(keys::kDevToolsPage, &devtools_str)) {
     *error = ASCIIToUTF16(errors::kInvalidDevToolsPage);
@@ skipping 783 matching lines @@
       }
     } else {
       DCHECK(result->default_popup_url.is_empty())
           << "Shouldn't be possible for the popup to be set.";
     }
   }
 
   return result.Pass();
 }
 
-bool Extension::LoadOAuth2Info(string16* error) {
-  if (!manifest_->HasKey(keys::kOAuth2))
-    return true;
-
-  if (!manifest_->GetString(keys::kOAuth2ClientId, &oauth2_info_.client_id) ||
-      oauth2_info_.client_id.empty()) {
-    *error = ASCIIToUTF16(errors::kInvalidOAuth2ClientId);
-    return false;
-  }
-
-  ListValue* list = NULL;
-  if (!manifest_->GetList(keys::kOAuth2Scopes, &list)) {
-    *error = ASCIIToUTF16(errors::kInvalidOAuth2Scopes);
-    return false;
-  }
-
-  for (size_t i = 0; i < list->GetSize(); ++i) {
-    std::string scope;
-    if (!list->GetString(i, &scope)) {
-      *error = ASCIIToUTF16(errors::kInvalidOAuth2Scopes);
-      return false;
-    }
-    oauth2_info_.scopes.push_back(scope);
-  }
-
-  return true;
-}
-
 bool Extension::HasMultipleUISurfaces() const {
   int num_surfaces = 0;
 
   if (page_action_info())
     ++num_surfaces;
 
   if (browser_action_info())
     ++num_surfaces;
 
   if (is_app())
@@ skipping 171 matching lines @@
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const PermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}
 
 }   // namespace extensions