Revert r50798 as it seems to create ui test failures

chrome/test/ui/ui_layout_test.cc

 // Copyright (c) 2009 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 "chrome/test/ui/ui_layout_test.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/test/test_file_util.h"
@@ skipping 138 matching lines @@
   src_dir = src_dir.Append(resource_dir);
   ASSERT_TRUE(file_util::DirectoryExists(src_dir));
 
   FilePath dest_parent_dir = temp_test_dir_.
       AppendASCII("LayoutTests").Append(parent_dir);
   ASSERT_TRUE(file_util::CreateDirectory(dest_parent_dir));
   FilePath dest_dir = dest_parent_dir.Append(resource_dir);
   ASSERT_TRUE(file_util::CopyDirectory(src_dir, dest_dir, true));
 }
 
-static size_t FindInsertPosition(const std::string& html) {
-  size_t tag_start = html.find("<html");
-  if (tag_start == std::string::npos)
-    return 0;
-  size_t tag_end = html.find(">", tag_start);
-  if (tag_end == std::string::npos)
-    return 0;
-  return tag_end + 1;
-}
-
 void UILayoutTest::RunLayoutTest(const std::string& test_case_file_name,
                                  int port) {
   SCOPED_TRACE(test_case_file_name.c_str());
 
   ASSERT_TRUE(!layout_test_controller_.empty());
 
   // Creates a new cookie name. We will have to use a new cookie because
   // this function could be called multiple times.
   std::string status_cookie(kTestCompleteCookie);
   status_cookie += IntToString(test_count_);
   test_count_++;
 
   // Reads the layout test HTML file.
   FilePath test_file_path(layout_test_dir_);
   test_file_path = test_file_path.AppendASCII(test_case_file_name);
   std::string test_html;
   ASSERT_TRUE(file_util::ReadFileToString(test_file_path, &test_html));
 
   // Injects the layout test controller into the test HTML.
-  size_t insertion_position = FindInsertPosition(test_html);
-  test_html.insert(insertion_position, layout_test_controller_);
-  ReplaceFirstSubstringAfterOffset(
-      &test_html, insertion_position, "%COOKIE%", status_cookie.c_str());
+  test_html.insert(0, layout_test_controller_);
+  ReplaceSubstringsAfterOffset(
+      &test_html, 0, "%COOKIE%", status_cookie.c_str());
 
   // Creates the new layout test HTML file.
   FilePath new_test_file_path(new_layout_test_dir_);
   new_test_file_path = new_test_file_path.AppendASCII(test_case_file_name);
   ASSERT_TRUE(file_util::WriteFile(new_test_file_path,
                                    &test_html.at(0),
                                    static_cast<int>(test_html.size())));
 
   scoped_ptr<GURL> new_test_url;
   if (port != kNoHttpPort)
@@ skipping 51 matching lines @@
                                       std::string* expected_result_value) {
   FilePath expected_result_path(result_dir_path);
   expected_result_path = expected_result_path.AppendASCII(test_case_file_name);
   expected_result_path = expected_result_path.InsertBeforeExtension(
       FILE_PATH_LITERAL("-expected"));
   expected_result_path =
       expected_result_path.ReplaceExtension(FILE_PATH_LITERAL("txt"));
   return file_util::ReadFileToString(expected_result_path,
                                      expected_result_value);
 }