Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / base / win / shortcut_unittest.cc

diff --git a/src/base/win/shortcut_unittest.cc b/src/base/win/shortcut_unittest.cc
index 75ee9ab..4bb227a 100644 (file)
--- a/src/base/win/shortcut_unittest.cc
+++ b/src/base/win/shortcut_unittest.cc
@@ -6,8 +6,8 @@
 
 #include <string>
 
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/test/test_file_util.h"
 #include "base/test/test_shortcut_win.h"
@@ -25,7 +25,7 @@ static const char kFileContents2[] = "This is another target.";
 
 class ShortcutTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(temp_dir_2_.CreateUniqueTempDir());
 
@@ -34,8 +34,7 @@ class ShortcutTest : public testing::Test {
     // Shortcut 1's properties
     {
       const FilePath target_file(temp_dir_.path().Append(L"Target 1.txt"));
-      file_util::WriteFile(target_file, kFileContents,
-                           arraysize(kFileContents));
+      WriteFile(target_file, kFileContents, arraysize(kFileContents));
 
       link_properties_.set_target(target_file);
       link_properties_.set_working_dir(temp_dir_.path());
@@ -49,11 +48,10 @@ class ShortcutTest : public testing::Test {
     // Shortcut 2's properties (all different from properties of shortcut 1).
     {
       const FilePath target_file_2(temp_dir_.path().Append(L"Target 2.txt"));
-      file_util::WriteFile(target_file_2, kFileContents2,
-                           arraysize(kFileContents2));
+      WriteFile(target_file_2, kFileContents2, arraysize(kFileContents2));
 
       FilePath icon_path_2;
-      base::CreateTemporaryFileInDir(temp_dir_.path(), &icon_path_2);
+      CreateTemporaryFileInDir(temp_dir_.path(), &icon_path_2);
 
       link_properties_2_.set_target(target_file_2);
       link_properties_2_.set_working_dir(temp_dir_2_.path());