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

Unified Diff: chrome/browser/extensions/all_urls_apitest.cc

Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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/all_urls_apitest.cc
diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc
index 233e2f44b6d9fb5d6910abc5e5b45d5816e779de..a29c260db8228575e05304fa8f2e88de5fe54e11 100644
--- a/chrome/browser/extensions/all_urls_apitest.cc
+++ b/chrome/browser/extensions/all_urls_apitest.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "extensions/common/id_util.h"
const std::string kAllUrlsTarget =
"files/extensions/api_test/all_urls/index.html";
@@ -31,8 +32,8 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, MAYBE_WhitelistedExtension) {
// Then add the two extensions to the whitelist.
extensions::Extension::ScriptingWhitelist whitelist;
- whitelist.push_back(extensions::Extension::GenerateIdForPath(extension_dir1));
- whitelist.push_back(extensions::Extension::GenerateIdForPath(extension_dir2));
+ whitelist.push_back(extensions::id_util::GenerateIdForPath(extension_dir1));
+ whitelist.push_back(extensions::id_util::GenerateIdForPath(extension_dir2));
extensions::Extension::SetScriptingWhitelist(whitelist);
// Then load extensions.

Powered by Google App Engine
This is Rietveld 408576698