| Index: chrome/browser/extensions/api/identity/identity_apitest.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/api/identity/identity_apitest.cc (revision 177049)
|
| +++ chrome/browser/extensions/api/identity/identity_apitest.cc (working copy)
|
| @@ -15,6 +15,9 @@
|
| #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"
|
| @@ -154,10 +157,12 @@
|
| // 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);
|
| 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";
|
| if ((fields_to_set & SCOPES) != 0) {
|
|
|