Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / installer / util / delete_after_reboot_helper_unittest.cc

diff --git a/src/chrome/installer/util/delete_after_reboot_helper_unittest.cc b/src/chrome/installer/util/delete_after_reboot_helper_unittest.cc
index c97cecd..b6f5046 100644 (file)
--- a/src/chrome/installer/util/delete_after_reboot_helper_unittest.cc
+++ b/src/chrome/installer/util/delete_after_reboot_helper_unittest.cc
@@ -5,7 +5,7 @@
 #include <windows.h>
 #include <shlobj.h>
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/win/registry.h"
@@ -24,13 +24,12 @@ class DeleteAfterRebootHelperTest : public testing::Test {
  protected:
   virtual void SetUp() {
     // Create a temporary directory for testing and fill it with some files.
-    std::wstring no_prefix;
-    file_util::CreateNewTempDirectory(no_prefix, &temp_dir_);
-    file_util::CreateTemporaryFileInDir(temp_dir_, &temp_file_);
+    base::CreateNewTempDirectory(base::FilePath::StringType(), &temp_dir_);
+    base::CreateTemporaryFileInDir(temp_dir_, &temp_file_);
 
     temp_subdir_ = temp_dir_.Append(L"subdir");
-    file_util::CreateDirectory(temp_subdir_);
-    file_util::CreateTemporaryFileInDir(temp_subdir_, &temp_subdir_file_);
+    base::CreateDirectory(temp_subdir_);
+    base::CreateTemporaryFileInDir(temp_subdir_, &temp_subdir_file_);
 
     // Copy the current pending moves and then clear it if we can:
     if (IsUserAnAdmin()) {
@@ -101,8 +100,8 @@ class DeleteAfterRebootHelperTest : public testing::Test {
 
 TEST_F(DeleteAfterRebootHelperTest, TestStringListToMultiSZConversions) {
   struct StringTest {
-    wchar_t* test_name;
-    wchar_t* str;
+    const wchar_t* test_name;
+    const wchar_t* str;
     DWORD length;
     size_t count;
   } tests[] = {
@@ -114,26 +113,29 @@ TEST_F(DeleteAfterRebootHelperTest, TestStringListToMultiSZConversions) {
   for (int i = 0; i < arraysize(tests); i++) {
     std::vector<PendingMove> string_list;
     EXPECT_TRUE(SUCCEEDED(
-        MultiSZBytesToStringArray(reinterpret_cast<char*>(tests[i].str),
-                                  tests[i].length, &string_list)))
+        MultiSZBytesToStringArray(reinterpret_cast<const char*>(tests[i].str),
+                                  tests[i].length,
+                                  &string_list)))
         << tests[i].test_name;
     EXPECT_EQ(tests[i].count, string_list.size()) << tests[i].test_name;
     std::vector<char> buffer;
     buffer.resize(WStringPairListSize(string_list));
     StringArrayToMultiSZBytes(string_list, &buffer);
-    EXPECT_TRUE(CompareBuffers(&buffer[0],
-                reinterpret_cast<char*>(tests[i].str),
-                tests[i].length)) << tests[i].test_name;
+    EXPECT_TRUE(CompareBuffers(const_cast<const char*>(&buffer[0]),
+                               reinterpret_cast<const char*>(tests[i].str),
+                               tests[i].length))
+        << tests[i].test_name;
   }
 
-  StringTest failures[] =
-    { L"malformed", reinterpret_cast<wchar_t*>("oddnumb\0\0"), 9, 1 };
+  StringTest failures[] = {
+      L"malformed", reinterpret_cast<const wchar_t*>("oddnumb\0\0"), 9, 1};
 
   for (int i = 0; i < arraysize(failures); i++) {
     std::vector<PendingMove> string_list;
-    EXPECT_FALSE(SUCCEEDED(
-        MultiSZBytesToStringArray(reinterpret_cast<char*>(failures[i].str),
-                                  failures[i].length, &string_list)))
+    EXPECT_FALSE(SUCCEEDED(MultiSZBytesToStringArray(
+        reinterpret_cast<const char*>(failures[i].str),
+        failures[i].length,
+        &string_list)))
         << failures[i].test_name;
   }
 }