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

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

Issue 9320059: Define FilePath::NormalizePathSeparators on all platforms (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: build fix Created 8 years, 10 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/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 99a89cb1a2a4919ca8f2949fc441922c6a873f91..d3b404e17ec6ef86e90c1bfa31466048c23ae280 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -989,14 +989,6 @@ class ExtensionServiceTest
content::NotificationRegistrar registrar_;
};
-FilePath NormalizeSeparators(const FilePath& path) {
-#if defined(FILE_PATH_USES_WIN_SEPARATORS)
- return path.NormalizeWindowsPathSeparators();
-#else
- return path;
-#endif // FILE_PATH_USES_WIN_SEPARATORS
-}
-
// Receives notifications from a PackExtensionJob, indicating either that
// packing succeeded or that there was some error.
class PackExtensionTestClient : public PackExtensionJob::Client {
@@ -1761,28 +1753,20 @@ TEST_F(ExtensionServiceTest, PackPunctuatedExtension) {
// Extension names containing punctuation, and the expected names for the
// packed extensions.
const FilePath punctuated_names[] = {
- FilePath(FilePath::StringType(
- FILE_PATH_LITERAL("this.extensions.name.has.periods"))),
- FilePath(FilePath::StringType(
- FILE_PATH_LITERAL(".thisextensionsnamestartswithaperiod"))),
- NormalizeSeparators(FilePath(FilePath::StringType(
- FILE_PATH_LITERAL("thisextensionhasaslashinitsname/")))),
+ FilePath(FILE_PATH_LITERAL("this.extensions.name.has.periods")),
+ FilePath(FILE_PATH_LITERAL(".thisextensionsnamestartswithaperiod")),
+ FilePath(FILE_PATH_LITERAL("thisextensionhasaslashinitsname/")).
+ NormalizePathSeparators(),
};
const FilePath expected_crx_names[] = {
- FilePath(FilePath::StringType(
- FILE_PATH_LITERAL("this.extensions.name.has.periods.crx"))),
- FilePath(FilePath::StringType(
- FILE_PATH_LITERAL(".thisextensionsnamestartswithaperiod.crx"))),
- FilePath(FilePath::StringType(
- FILE_PATH_LITERAL("thisextensionhasaslashinitsname.crx"))),
+ FilePath(FILE_PATH_LITERAL("this.extensions.name.has.periods.crx")),
+ FilePath(FILE_PATH_LITERAL(".thisextensionsnamestartswithaperiod.crx")),
+ FilePath(FILE_PATH_LITERAL("thisextensionhasaslashinitsname.crx")),
};
const FilePath expected_private_key_names[] = {
- FilePath(FilePath::StringType(
- FILE_PATH_LITERAL("this.extensions.name.has.periods.pem"))),
- FilePath(FilePath::StringType(
- FILE_PATH_LITERAL(".thisextensionsnamestartswithaperiod.pem"))),
- FilePath(FilePath::StringType(
- FILE_PATH_LITERAL("thisextensionhasaslashinitsname.pem"))),
+ FilePath(FILE_PATH_LITERAL("this.extensions.name.has.periods.pem")),
+ FilePath(FILE_PATH_LITERAL(".thisextensionsnamestartswithaperiod.pem")),
+ FilePath(FILE_PATH_LITERAL("thisextensionhasaslashinitsname.pem")),
};
for (size_t i = 0; i < arraysize(punctuated_names); ++i) {
« no previous file with comments | « chrome/browser/extensions/extension_protocols.cc ('k') | chrome/browser/ui/views/aura/app_list/extension_app_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698