Move UTF16ToASCII, remove WideToASCII.

chrome/installer/util/move_tree_work_item_unittest.cc

 // Copyright (c) 2011 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 <windows.h>
 
 #include <fstream>
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/installer/util/installer_util_test_common.h"
 #include "chrome/installer/util/move_tree_work_item.h"
 #include "chrome/installer/util/work_item.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 class MoveTreeWorkItemTest : public testing::Test {
  protected:
   virtual void SetUp() {
     ASSERT_TRUE(temp_from_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(temp_to_dir_.CreateUniqueTempDir());
   }
 
   base::ScopedTempDir temp_from_dir_;
   base::ScopedTempDir temp_to_dir_;
 };
 
 // Simple function to dump some text into a new file.
 void CreateTextFile(const std::wstring& filename,
                     const std::wstring& contents) {
   std::wofstream file;
-  file.open(WideToASCII(filename).c_str());
+  file.open(base::UTF16ToASCII(filename).c_str());
   ASSERT_TRUE(file.is_open());
   file << contents;
   file.close();
 }
 
 // Simple function to read text from a file.
 std::wstring ReadTextFile(const base::FilePath& path) {
   WCHAR contents[64];
   std::wifstream file;
-  file.open(WideToASCII(path.value()).c_str());
+  file.open(base::UTF16ToASCII(path.value()).c_str());
   EXPECT_TRUE(file.is_open());
   file.getline(contents, arraysize(contents));
   file.close();
   return std::wstring(contents);
 }
 
 const wchar_t kTextContent1[] = L"Gooooooooooooooooooooogle";
 const wchar_t kTextContent2[] = L"Overwrite Me";
 };  // namespace
 
@@ skipping 476 matching lines @@
   // the source files.
   EXPECT_TRUE(base::PathExists(from_dir1));
   EXPECT_TRUE(base::PathExists(to_dir));
   EXPECT_TRUE(base::PathExists(orig_to_file));
   EXPECT_EQ(0, ReadTextFile(orig_to_file).compare(kTextContent1));
   EXPECT_EQ(0, ReadTextFile(from_file).compare(kTextContent1));
 
   // Also, after rollback the new "to" file should be gone.
   EXPECT_FALSE(base::PathExists(new_to_file2));
 }