Revert 239400 "Revert 239280 "Move more file_util functions to b..."

trunk/src/base/win/shortcut_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 "base/win/shortcut.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 73 matching lines @@
   ShortcutProperties only_target_properties;
   only_target_properties.set_target(link_properties_.target);
 
   ASSERT_TRUE(CreateOrUpdateShortcutLink(
       link_file_, only_target_properties, SHORTCUT_CREATE_ALWAYS));
 
   FilePath resolved_name;
   EXPECT_TRUE(ResolveShortcut(link_file_, &resolved_name, NULL));
 
   char read_contents[arraysize(kFileContents)];
-  file_util::ReadFile(resolved_name, read_contents, arraysize(read_contents));
+  base::ReadFile(resolved_name, read_contents, arraysize(read_contents));
   EXPECT_STREQ(kFileContents, read_contents);
 }
 
 TEST_F(ShortcutTest, ResolveShortcutWithArgs) {
   ASSERT_TRUE(CreateOrUpdateShortcutLink(
       link_file_, link_properties_, SHORTCUT_CREATE_ALWAYS));
 
   FilePath resolved_name;
   string16 args;
   EXPECT_TRUE(ResolveShortcut(link_file_, &resolved_name, &args));
 
   char read_contents[arraysize(kFileContents)];
-  file_util::ReadFile(resolved_name, read_contents, arraysize(read_contents));
+  base::ReadFile(resolved_name, read_contents, arraysize(read_contents));
   EXPECT_STREQ(kFileContents, read_contents);
   EXPECT_EQ(link_properties_.arguments, args);
 }
 
 TEST_F(ShortcutTest, CreateShortcutWithOnlySomeProperties) {
   ShortcutProperties target_and_args_properties;
   target_and_args_properties.set_target(link_properties_.target);
   target_and_args_properties.set_arguments(link_properties_.arguments);
 
   ASSERT_TRUE(CreateOrUpdateShortcutLink(
@@ skipping 32 matching lines @@
       SHORTCUT_UPDATE_EXISTING));
 
   ShortcutProperties expected_properties = link_properties_;
   expected_properties.set_target(link_properties_2_.target);
   ValidateShortcut(link_file_, expected_properties);
 
   FilePath resolved_name;
   EXPECT_TRUE(ResolveShortcut(link_file_, &resolved_name, NULL));
 
   char read_contents[arraysize(kFileContents2)];
-  file_util::ReadFile(resolved_name, read_contents, arraysize(read_contents));
+  base::ReadFile(resolved_name, read_contents, arraysize(read_contents));
   EXPECT_STREQ(kFileContents2, read_contents);
 }
 
 TEST_F(ShortcutTest, UpdateShortcutMakeDualMode) {
   ASSERT_TRUE(CreateOrUpdateShortcutLink(
       link_file_, link_properties_, SHORTCUT_CREATE_ALWAYS));
 
   ShortcutProperties make_dual_mode_properties;
   make_dual_mode_properties.set_dual_mode(true);
 
@@ skipping 93 matching lines @@
   ASSERT_TRUE(CreateOrUpdateShortcutLink(
       link_file_, link_properties_2_, SHORTCUT_REPLACE_EXISTING));
 
   ShortcutProperties expected_properties(link_properties_2_);
   expected_properties.set_arguments(link_properties_.arguments);
   ValidateShortcut(link_file_, expected_properties);
 }
 
 }  // namespace win
 }  // namespace base