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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « chrome/browser/extensions/extension_creator.cc ('k') | chrome/browser/extensions/extension_icon_image.cc » ('j') | chrome/browser/sync/test/integration/sync_extension_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_function_test_utils.cc
diff --git a/chrome/browser/extensions/extension_function_test_utils.cc b/chrome/browser/extensions/extension_function_test_utils.cc
index b642c1fd0145a3b88f59e85023c5e6b42f0973e0..d834aa002a693d5a709e8c981c66e59d53534f7a 100644
--- a/chrome/browser/extensions/extension_function_test_utils.cc
+++ b/chrome/browser/extensions/extension_function_test_utils.cc
@@ -15,6 +15,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"
#include "testing/gtest/include/gtest/gtest.h"
using content::WebContents;
@@ -135,7 +136,7 @@ scoped_refptr<Extension> CreateExtension(
const base::FilePath test_extension_path;
std::string id;
if (!id_input.empty())
- CHECK(Extension::GenerateId(id_input, &id));
+ id = extensions::id_util::GenerateId(id_input);
scoped_refptr<Extension> extension(Extension::Create(
test_extension_path,
location,
« no previous file with comments | « chrome/browser/extensions/extension_creator.cc ('k') | chrome/browser/extensions/extension_icon_image.cc » ('j') | chrome/browser/sync/test/integration/sync_extension_helper.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698