diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-09 17:42:26 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-09 17:42:26 +0000 |
| commit | f0ff2ad2c5bcf8e206baf27dbfaeef7743fd6c0d (patch) | |
| tree | f16870d528455ef5acb84e180e6e07afb308ee6f /chrome_frame | |
| parent | 456f3b4c2d9942fd86e7c374426d37f029542a9a (diff) | |
| download | chromium_src-f0ff2ad2c5bcf8e206baf27dbfaeef7743fd6c0d.zip chromium_src-f0ff2ad2c5bcf8e206baf27dbfaeef7743fd6c0d.tar.gz chromium_src-f0ff2ad2c5bcf8e206baf27dbfaeef7743fd6c0d.tar.bz2 | |
Move Copy* into the base namespace.
This also creates a new base::internal namespace in file_util and I moved some of the internal functions in file_util to there.
BUG=
TBR=jam
Review URL: https://codereview.chromium.org/18332014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/dll_redirector_loading_test.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/test/dll_redirector_loading_test.cc b/chrome_frame/test/dll_redirector_loading_test.cc index b3cea3d..404db0e 100644 --- a/chrome_frame/test/dll_redirector_loading_test.cc +++ b/chrome_frame/test/dll_redirector_loading_test.cc @@ -61,8 +61,8 @@ class DllRedirectorLoadingTest : public testing::Test { // folder. original_chrome_frame_dll_ = original_version_dir.Append(build_chrome_frame_dll.BaseName()); - ASSERT_TRUE(file_util::CopyFile(build_chrome_frame_dll, - original_chrome_frame_dll_)); + ASSERT_TRUE(base::CopyFile(build_chrome_frame_dll, + original_chrome_frame_dll_)); ASSERT_TRUE(file_util::PathExists(original_chrome_frame_dll_)); // Temporary location for the new Chrome Frame DLL. diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index 15e16f2..7ffb836 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -110,12 +110,12 @@ void ChromeFrameTestWithWebServer::SetUpTestCase() { CFInstance_src_path = chrome_frame_source_path.AppendASCII("CFInstance.js"); CFInstance_path_ = test_file_path_.AppendASCII("CFInstance.js"); - ASSERT_TRUE(file_util::CopyFile(CFInstance_src_path, CFInstance_path_)); + ASSERT_TRUE(base::CopyFile(CFInstance_src_path, CFInstance_path_)); CFInstall_src_path = chrome_frame_source_path.AppendASCII("CFInstall.js"); CFInstall_path_ = test_file_path_.AppendASCII("CFInstall.js"); - ASSERT_TRUE(file_util::CopyFile(CFInstall_src_path, CFInstall_path_)); + ASSERT_TRUE(base::CopyFile(CFInstall_src_path, CFInstall_path_)); loop_ = new chrome_frame_test::TimedMsgLoop(); loop_->set_snapshot_on_timeout(true); |