Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(756)

Side by Side Diff: chrome_frame/test/test_with_web_server.cc

Issue 16950028: Move file_util::Delete to the base namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome_frame/test/test_scrubber.cc ('k') | chromeos/dbus/cros_disks_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome_frame/test/test_with_web_server.h" 5 #include "chrome_frame/test/test_with_web_server.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/file_version_info.h" 9 #include "base/file_version_info.h"
10 #include "base/files/memory_mapped_file.h" 10 #include "base/files/memory_mapped_file.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 129
130 // static 130 // static
131 void ChromeFrameTestWithWebServer::TearDownTestCase() { 131 void ChromeFrameTestWithWebServer::TearDownTestCase() {
132 delete server_mock_; 132 delete server_mock_;
133 server_mock_ = NULL; 133 server_mock_ = NULL;
134 delete listener_mock_; 134 delete listener_mock_;
135 listener_mock_ = NULL; 135 listener_mock_ = NULL;
136 local_address_.clear(); 136 local_address_.clear();
137 delete loop_; 137 delete loop_;
138 loop_ = NULL; 138 loop_ = NULL;
139 file_util::Delete(CFInstall_path_, false); 139 base::Delete(CFInstall_path_, false);
140 file_util::Delete(CFInstance_path_, false); 140 base::Delete(CFInstance_path_, false);
141 if (temp_dir_.IsValid()) 141 if (temp_dir_.IsValid())
142 EXPECT_TRUE(temp_dir_.Delete()); 142 EXPECT_TRUE(temp_dir_.Delete());
143 } 143 }
144 144
145 // static 145 // static
146 const base::FilePath& 146 const base::FilePath&
147 ChromeFrameTestWithWebServer::GetChromeUserDataDirectory() { 147 ChromeFrameTestWithWebServer::GetChromeUserDataDirectory() {
148 if (!temp_dir_.IsValid()) { 148 if (!temp_dir_.IsValid()) {
149 EXPECT_TRUE(temp_dir_.CreateUniqueTempDir()); 149 EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
150 chrome_user_data_dir_ = temp_dir_.path().AppendASCII("User Data"); 150 chrome_user_data_dir_ = temp_dir_.path().AppendASCII("User Data");
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after
1090 // This test loads a large page and ensures that the full page contents are 1090 // This test loads a large page and ensures that the full page contents are
1091 // actually loaded via a self-validating HTML page. This is done due to a bug 1091 // actually loaded via a self-validating HTML page. This is done due to a bug
1092 // whereby the middle of the response stream would sometimes be truncated when 1092 // whereby the middle of the response stream would sometimes be truncated when
1093 // loading a CF document. See http://crbug.com/178421 for details. 1093 // loading a CF document. See http://crbug.com/178421 for details.
1094 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_LargePageLoad) { 1094 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_LargePageLoad) {
1095 const wchar_t kLargePageLoadPage[] = 1095 const wchar_t kLargePageLoadPage[] =
1096 L"chrome_frame_large_page.html"; 1096 L"chrome_frame_large_page.html";
1097 1097
1098 SimpleBrowserTest(IE, kLargePageLoadPage); 1098 SimpleBrowserTest(IE, kLargePageLoadPage);
1099 } 1099 }
OLDNEW
« no previous file with comments | « chrome_frame/test/test_scrubber.cc ('k') | chromeos/dbus/cros_disks_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698