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;
-using extensions::IdentityGetAuthTokenFunction;
-using extensions::IdentityLaunchWebAuthFlowFunction;
 using testing::_;
 using testing::Return;
 using testing::ReturnRef;
 
-namespace errors = extensions::identity_constants;
+namespace extensions {
+
+namespace errors = identity_constants;
 namespace utils = extension_function_test_utils;
 
-namespace {

[Devlin, 2013/01/16 23:25:40]

Why remove this?

[SanjoyPal, 2013/01/17 00:11:13]

which one?

[Devlin, 2013/01/17 10:04:59]

The anonymous namespace. It won't break anything to take it out; I'm just
curious why it was removed. It seems like it was a fairly standard/logical place
to use one.

[SanjoyPal, 2013/01/17 19:13:43]

Done.

-
 static const char kAccessToken[] = "auth_token";
 
 class TestLoginUI : public LoginUIService::LoginUI {
  public:
   virtual void FocusUI() OVERRIDE {}
   virtual void CloseUI() OVERRIDE {}
 };
 
 class TestOAuth2MintTokenFlow : public OAuth2MintTokenFlow {
  public:
@@ skipping 28 matching lines @@
         break;
       }
     }
   }
 
  private:
   ResultType result_;
   OAuth2MintTokenFlow::Delegate* delegate_;
 };
 
-}  // namespace
-
 class MockGetAuthTokenFunction : public IdentityGetAuthTokenFunction {
  public:
   MockGetAuthTokenFunction() : install_ui_result_(false),
                                login_ui_shown_(false),
                                install_ui_shown_(false) {
   }
 
   void set_install_ui_result(bool result) {
     install_ui_result_ = result;
   }
@@ skipping 47 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) {
+  ManifestHandler::Register(extension_manifest_keys::kOAuth2,

[Devlin, 2013/01/16 23:25:40]

This registration should probably be done in a SetUp() function, instead of
here.

[SanjoyPal, 2013/01/17 00:11:13]

Done.

+                            new OAuth2ManifestHandler);
     const Extension* ext = LoadExtension(
         test_data_dir_.AppendASCII("platform_apps/oauth2"));
-    Extension::OAuth2Info& oauth2_info = const_cast<Extension::OAuth2Info&>(
-        ext->oauth2_info());
+    OAuth2Info& oauth2_info = const_cast<OAuth2Info&>(
+        OAuth2Info::GetOAuth2Info(ext));
     if ((fields_to_set & CLIENT_ID) != 0)
       oauth2_info.client_id = "client1";
     if ((fields_to_set & SCOPES) != 0) {
       oauth2_info.scopes.push_back("scope1");
       oauth2_info.scopes.push_back("scope2");
     }
     return ext;
   }
 };
 
@@ skipping 234 matching lines @@
       int expected_x,
       int expected_y,
       int expected_width,
       int expected_height) {
     content::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_BROWSER_WINDOW_READY,
         content::NotificationService::AllSources());
 
    scoped_refptr<IdentityLaunchWebAuthFlowFunction> function(
       new IdentityLaunchWebAuthFlowFunction());
-    scoped_refptr<extensions::Extension> empty_extension(
+    scoped_refptr<Extension> empty_extension(
         utils::CreateEmptyExtension());
     function->set_extension(empty_extension.get());
     std::string args = base::StringPrintf(
         "[{\"interactive\": true, \"url\": \"data:text/html,auth\"%s%s}]",
         extra_params.length() ? "," : "",
         extra_params.c_str());
     scoped_ptr<base::ListValue> parsed_args(utils::ParseList(args));
     EXPECT_TRUE(parsed_args.get()) <<
           "Could not parse extension function arguments: " << args;
     function->SetArgs(parsed_args.get());
@@ skipping 19 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);
 }
+
+}  // namespace extensions