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

chrome/common/extensions/extension.cc

Index: chrome/common/extensions/extension.cc
===================================================================
--- chrome/common/extensions/extension.cc	(revision 176209)
+++ chrome/common/extensions/extension.cc	(working copy)
@@ -343,9 +343,6 @@
 
 Extension::Requirements::~Requirements() {}
 
-Extension::OAuth2Info::OAuth2Info() {}
-Extension::OAuth2Info::~OAuth2Info() {}
-
 Extension::ActionInfo::ActionInfo() {}
 Extension::ActionInfo::~ActionInfo() {}
 
@@ -1989,8 +1986,7 @@
       !LoadBackgroundPage(api_permissions, error) ||
       !LoadBackgroundPersistent(api_permissions, error) ||
       !LoadBackgroundAllowJSAccess(api_permissions, error) ||
-      !LoadWebIntentServices(error) ||
-      !LoadOAuth2Info(error))
+      !LoadWebIntentServices(error))
     return false;
 
   return true;
@@ -2848,10 +2844,12 @@
   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;
 }
@@ -3655,34 +3653,6 @@
   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;