Define FilePath::NormalizePathSeparators on all platforms

chrome/browser/extensions/extension_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_service_unittest.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 971 matching lines @@
 
  protected:
   ExtensionList loaded_;
   std::string unloaded_id_;
   const Extension* installed_;
 
  private:
   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 {
  public:
   PackExtensionTestClient(const FilePath& expected_crx_path,
                           const FilePath& expected_private_key_path);
   virtual void OnPackSuccess(const FilePath& crx_path,
                              const FilePath& private_key_path);
   virtual void OnPackFailure(const std::string& error_message,
                              ExtensionCreator::ErrorType type);
@@ skipping 744 matching lines @@
       .AppendASCII("Extensions")
       .AppendASCII(good0)
       .AppendASCII("1.0.0.0");
 
   ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   // 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) {
     SCOPED_TRACE(punctuated_names[i].value().c_str());
     FilePath output_dir = temp_dir.path().Append(punctuated_names[i]);
 
     // Copy the extension into the output directory, as PackExtensionJob doesn't
     // let us choose where to output the packed extension.
     ASSERT_TRUE(file_util::CopyDirectory(input_directory, output_dir, true));
 
@@ skipping 2992 matching lines @@
   ASSERT_FALSE(AddPendingSyncInstall());
 
   // Wait for the external source to install.
   WaitForCrxInstall(crx_path_, INSTALL_NEW);
   ASSERT_TRUE(IsCrxInstalled());
 
   // Now that the extension is installed, sync request should fail
   // because the extension is already installed.
   ASSERT_FALSE(AddPendingSyncInstall());
 }