Cleanup: Deprecate wstring version of file_util::CopyDirectory().

base/file_util_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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 284 matching lines @@
   {L"/foo/bar./", L""},
   {L"/foo/bar/filename.extension.extension2", L"extension2"},
   {L".", L""},
   {L"..", L""},
   {L"./foo", L""},
   {L"./foo.extension", L"extension"},
   {L"/foo.extension1/bar.extension2", L"extension2"},
 #endif
 };
 
-#if defined(OS_WIN)
-// This function has been deprecated on non-Windows.
-TEST_F(FileUtilTest, GetFileExtensionFromPath) {
-  for (unsigned int i = 0; i < arraysize(extension_cases); ++i) {
-    const extension_case& ext = extension_cases[i];
-    const std::wstring fext = file_util::GetFileExtensionFromPath(ext.path);
-    EXPECT_EQ(ext.extension, fext);
-  }
-}
-#endif
-
 // Test finding the directory component of a path
 static const struct dir_case {
   const wchar_t* full_path;
   const wchar_t* directory;
 } dir_cases[] = {
 #if defined(OS_WIN)
   {L"C:\\WINDOWS\\system32\\gdi32.dll", L"C:\\WINDOWS\\system32"},
   {L"C:\\WINDOWS\\system32\\not_exist_thx_1138", L"C:\\WINDOWS\\system32"},
   {L"C:\\WINDOWS\\system32\\", L"C:\\WINDOWS\\system32"},
   {L"C:\\WINDOWS\\system32\\\\", L"C:\\WINDOWS\\system32"},
@@ skipping 1115 matching lines @@
 
 // We don't need equivalent functionality outside of Windows.
 #if defined(OS_WIN)
 TEST_F(FileUtilTest, ResolveShortcutTest) {
   FilePath target_file = temp_dir_.path().Append(L"Target.txt");
   CreateTextFile(target_file, L"This is the target.");
 
   FilePath link_file = temp_dir_.path().Append(L"Link.lnk");
 
   HRESULT result;
-  IShellLink *shell = NULL;
-  IPersistFile *persist = NULL;
+  IShellLink* shell = NULL;
+  IPersistFile* persist = NULL;
 
   CoInitialize(NULL);
   // Temporarily create a shortcut for test
   result = CoCreateInstance(CLSID_ShellLink, NULL,
                           CLSCTX_INPROC_SERVER, IID_IShellLink,
                           reinterpret_cast<LPVOID*>(&shell));
   EXPECT_TRUE(SUCCEEDED(result));
   result = shell->QueryInterface(IID_IPersistFile,
                              reinterpret_cast<LPVOID*>(&persist));
   EXPECT_TRUE(SUCCEEDED(result));
@@ skipping 109 matching lines @@
     EXPECT_FALSE(file_util::DirectoryExists(temp_files[i]));
   }
   for (int i = 0; i < 3; i++)
     EXPECT_FALSE(temp_files[i] == temp_files[(i+1)%3]);
   for (int i = 0; i < 3; i++)
     EXPECT_TRUE(file_util::Delete(temp_files[i], false));
 }
 
 TEST_F(FileUtilTest, CreateAndOpenTemporaryFileTest) {
   FilePath names[3];
-  FILE *fps[3];
+  FILE* fps[3];
   int i;
 
   // Create; make sure they are open and exist.
   for (i = 0; i < 3; ++i) {
     fps[i] = file_util::CreateAndOpenTemporaryFile(&(names[i]));
     ASSERT_TRUE(fps[i]);
     EXPECT_TRUE(file_util::PathExists(names[i]));
   }
 
   // Make sure all names are unique.
@@ skipping 354 matching lines @@
     ok_gids_.insert(stat_buf.st_gid);
     bad_gids_.insert(stat_buf.st_gid + 1);
 
     ASSERT_EQ(uid_, getuid());  // This process should be the owner.
 
     // To ensure that umask settings do not cause the initial state
     // of permissions to be different from what we expect, explicitly
     // set permissions on the directories we create.
     // Make all files and directories non-world-writable.
     mode_t enabled_permissions =
-        S_IRWXU | // User can read, write, traverse
-        S_IRWXG;  // Group can read, write, traverse
+        S_IRWXU |  // User can read, write, traverse
+        S_IRWXG;   // Group can read, write, traverse
     mode_t disabled_permissions =
-        S_IRWXO;  // Other users can't read, write, traverse.
+        S_IRWXO;   // Other users can't read, write, traverse.
 
     ASSERT_NO_FATAL_FAILURE(
         ChangePosixFilePermissions(
             base_dir_, enabled_permissions, disabled_permissions));
     ASSERT_NO_FATAL_FAILURE(
         ChangePosixFilePermissions(
             sub_dir_, enabled_permissions, disabled_permissions));
   }
 
   FilePath base_dir_;
@@ skipping 198 matching lines @@
 
   EXPECT_TRUE(
       file_util::VerifyPathControlledByUser(
           base_dir_, sub_dir_, uid_, multiple_gids));
   EXPECT_TRUE(
       file_util::VerifyPathControlledByUser(
           base_dir_, text_file_, uid_, multiple_gids));
   EXPECT_TRUE(
       file_util::VerifyPathControlledByUser(
           sub_dir_, text_file_, uid_, multiple_gids));
-
 }
 
 TEST_F(VerifyPathControlledByUserTest, WriteBitChecks) {
   // Make all files and directories non-world-writable.
   ASSERT_NO_FATAL_FAILURE(
       ChangePosixFilePermissions(base_dir_, 0u, S_IWOTH));
   ASSERT_NO_FATAL_FAILURE(
       ChangePosixFilePermissions(sub_dir_, 0u, S_IWOTH));
   ASSERT_NO_FATAL_FAILURE(
       ChangePosixFilePermissions(text_file_, 0u, S_IWOTH));
 
   // Initialy, we control all parts of the path.
   EXPECT_TRUE(
       file_util::VerifyPathControlledByUser(
           base_dir_, sub_dir_, uid_, ok_gids_));
   EXPECT_TRUE(
       file_util::VerifyPathControlledByUser(
           base_dir_, text_file_, uid_, ok_gids_));
   EXPECT_TRUE(
       file_util::VerifyPathControlledByUser(
           sub_dir_, text_file_, uid_, ok_gids_));
 
-   // Make base_dir_ world-writable.
+  // Make base_dir_ world-writable.
   ASSERT_NO_FATAL_FAILURE(
       ChangePosixFilePermissions(base_dir_, S_IWOTH, 0u));
   EXPECT_FALSE(
       file_util::VerifyPathControlledByUser(
           base_dir_, sub_dir_, uid_, ok_gids_));
   EXPECT_FALSE(
       file_util::VerifyPathControlledByUser(
           base_dir_, text_file_, uid_, ok_gids_));
   EXPECT_TRUE(
       file_util::VerifyPathControlledByUser(
@@ skipping 62 matching lines @@
       file_util::VerifyPathControlledByUser(
           base_dir_, text_file_, uid_, ok_gids_));
   EXPECT_TRUE(
       file_util::VerifyPathControlledByUser(
           sub_dir_, text_file_, uid_, ok_gids_));
 }
 
 #endif  // defined(OS_POSIX)
 
 }  // namespace