Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(370)

Unified Diff: chrome/browser/extensions/api/identity/identity_apitest.cc

Issue 481433005: Extensions: Move id_util functions to crx_file component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert last patchset. function returns Extension* and can't use an assert. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/identity/identity_apitest.cc
diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc
index ac2a9cf75b9be3af15551fa0f7a15cd7f7177cdd..337fb2a230aa45bd01361243b30e5ab54e4d6c01 100644
--- a/chrome/browser/extensions/api/identity/identity_apitest.cc
+++ b/chrome/browser/extensions/api/identity/identity_apitest.cc
@@ -33,6 +33,7 @@
#include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/test_switches.h"
+#include "components/crx_file/id_util.h"
#include "components/signin/core/browser/signin_manager.h"
#include "components/signin/core/common/profile_management_switches.h"
#include "components/signin/core/common/signin_pref_names.h"
@@ -40,7 +41,6 @@
#include "content/public/browser/notification_source.h"
#include "content/public/test/test_utils.h"
#include "extensions/browser/guest_view/guest_view_base.h"
-#include "extensions/common/id_util.h"
#include "google_apis/gaia/google_service_auth_error.h"
#include "google_apis/gaia/oauth2_mint_token_flow.h"
#include "net/test/spawned_test_server/spawned_test_server.h"
@@ -1607,7 +1607,7 @@ class RemoveCachedAuthTokenFunctionTest : public ExtensionBrowserTest {
}
void SetCachedToken(IdentityTokenCacheValue& token_data) {
- ExtensionTokenKey key(extensions::id_util::GenerateId(kExtensionId),
+ ExtensionTokenKey key(crx_file::id_util::GenerateId(kExtensionId),
"test@example.com",
std::set<std::string>());
id_api()->SetCachedToken(key, token_data);
@@ -1615,7 +1615,7 @@ class RemoveCachedAuthTokenFunctionTest : public ExtensionBrowserTest {
const IdentityTokenCacheValue& GetCachedToken() {
return id_api()->GetCachedToken(
- ExtensionTokenKey(extensions::id_util::GenerateId(kExtensionId),
+ ExtensionTokenKey(crx_file::id_util::GenerateId(kExtensionId),
"test@example.com",
std::set<std::string>()));
}

Powered by Google App Engine
This is Rietveld 408576698