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

chrome/browser/extensions/api/identity/identity_apitest.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 "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/identity/identity_api.h"
 #include "chrome/browser/extensions/api/identity/web_auth_flow.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h"
+#include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/oauth2_mint_token_flow.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using extensions::Extension;

[Devlin, 2013/01/14 20:18:34]

This whole file should probably be in the extensions:: namespace.

[Devlin, 2013/01/16 19:36:12]

I think you missed this one.

[SanjoyPal, 2013/01/16 20:11:28]

Done.

 using extensions::IdentityGetAuthTokenFunction;
 using extensions::IdentityLaunchWebAuthFlowFunction;
 using testing::_;
 using testing::Return;
 using testing::ReturnRef;
 
 namespace errors = extensions::identity_constants;
 namespace utils = extension_function_test_utils;
 
 namespace {
@@ skipping 108 matching lines @@
     NONE = 0,
     CLIENT_ID = 1,
     SCOPES = 2
   };
 
   ~GetAuthTokenFunctionTest() {}
 
   // Helper to create an extension with specific OAuth2Info fields set.
   // |fields_to_set| should be computed by using fields of Oauth2Fields enum.
   const Extension* CreateExtension(int fields_to_set) {
+  extensions::ManifestHandler::Register(extension_manifest_keys::kOAuth2,
+                            new extensions::OAuth2ManifestHandler);

[Devlin, 2013/01/14 20:18:34]

Indentation.

[SanjoyPal, 2013/01/16 19:10:52]

Done.

     const Extension* ext = LoadExtension(
         test_data_dir_.AppendASCII("platform_apps/oauth2"));
-    Extension::OAuth2Info& oauth2_info = const_cast<Extension::OAuth2Info&>(
-        ext->oauth2_info());
+    extensions::OAuth2Info* oauth2_info = const_cast<extensions::OAuth2Info*>(
+        extensions::OAuth2Info::GetOAuth2Info(ext));
     if ((fields_to_set & CLIENT_ID) != 0)
-      oauth2_info.client_id = "client1";
+      oauth2_info->client_id = "client1";
     if ((fields_to_set & SCOPES) != 0) {
-      oauth2_info.scopes.push_back("scope1");
-      oauth2_info.scopes.push_back("scope2");
+      oauth2_info->scopes.push_back("scope1");
+      oauth2_info->scopes.push_back("scope2");
     }
     return ext;
   }
 };
 
 IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
                        NoClientId) {
   scoped_refptr<MockGetAuthTokenFunction> func(new MockGetAuthTokenFunction());
   func->set_extension(CreateExtension(SCOPES));
   std::string error = utils::RunFunctionAndReturnError(
@@ skipping 269 matching lines @@
 };
 
 IN_PROC_BROWSER_TEST_F(LaunchWebAuthFlowFunctionTest, Bounds) {
   RunAndCheckBounds("", 0, 0, 0, 0);
   RunAndCheckBounds("\"width\": 100, \"height\": 200", 0, 0, 100, 200);
   RunAndCheckBounds("\"left\": 100, \"top\": 200", 100, 200, 0, 0);
   RunAndCheckBounds(
       "\"left\": 100, \"top\": 200, \"width\": 300, \"height\": 400",
       100, 200, 300, 400);
 }