Revert 204014 "Don't track whether a resize ack is pending durin..."

trunk/src/content/test/layout_browsertest.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 "content/test/layout_browsertest.h"
 
 #include <sstream>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/run_loop.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/test/browser_test_utils.h"
-#include "content/public/test/layouttest_support.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/shell.h"
 #include "content/shell/webkit_test_controller.h"
 #include "content/test/content_browser_test_utils.h"
 #include "content/test/layout_test_http_server.h"
 #include "net/base/net_util.h"
 
 #if defined(OS_WIN)
 static const char kPlatformName[] = "chromium-win";
 #elif defined(OS_MACOSX)
@@ skipping 39 matching lines @@
     : test_parent_dir_(test_parent_dir), test_case_dir_(test_case_dir),
       port_(port) {
 }
 
 InProcessBrowserLayoutTest::~InProcessBrowserLayoutTest() {
   if (test_http_server_)
     CHECK(test_http_server_->Stop());
 }
 
 void InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture() {
-  EnableBrowserLayoutTestMode();
-
   base::FilePath src_dir;
   ASSERT_TRUE(PathService::Get(DIR_LAYOUT_TESTS, &src_dir));
   base::FilePath absolute_parent_dir = src_dir.Append(test_parent_dir_);
   ASSERT_TRUE(file_util::DirectoryExists(absolute_parent_dir));
   layout_test_dir_ = absolute_parent_dir.Append(test_case_dir_);
   ASSERT_TRUE(file_util::DirectoryExists(layout_test_dir_));
 
   // Gets the file path to rebased expected result directory for the current
   // platform.
   //   $LayoutTestRoot/platform/chromium_***/...
@@ skipping 114 matching lines @@
                                      expected.size()));
   EXPECT_NE(-1, file_util::WriteFile(actual_filename,
                                      actual.c_str(),
                                      actual.size()));
   return base::StringPrintf("Wrote %"PRFilePath" %"PRFilePath,
                             expected_filename.value().c_str(),
                             actual_filename.value().c_str());
 }
 
 }  // namespace content