diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
| commit | 2a99a7e74a7f215066514fe81d2bfa6639d9eddd (patch) | |
| tree | 7c2d04841fcd599fd83b0f0bb1100e1c89a35bae /content/browser/download/save_package_browsertest.cc | |
| parent | 61c449bbbb53310a8c041d8cefdd6b01a126cc7e (diff) | |
| download | chromium_org-2a99a7e74a7f215066514fe81d2bfa6639d9eddd.tar.gz | |
Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
Diffstat (limited to 'content/browser/download/save_package_browsertest.cc')
| -rw-r--r-- | content/browser/download/save_package_browsertest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/content/browser/download/save_package_browsertest.cc b/content/browser/download/save_package_browsertest.cc index 021f583c06..cfa63edefb 100644 --- a/content/browser/download/save_package_browsertest.cc +++ b/content/browser/download/save_package_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/scoped_temp_dir.h" +#include "base/files/scoped_temp_dir.h" #include "content/browser/download/save_package.h" #include "content/shell/shell.h" #include "content/test/content_browser_test.h" @@ -14,21 +14,21 @@ const char kTestFile[] = "files/simple_page.html"; class SavePackageBrowserTest : public ContentBrowserTest { protected: - void SetUp() OVERRIDE { + virtual void SetUp() OVERRIDE { ASSERT_TRUE(save_dir_.CreateUniqueTempDir()); ContentBrowserTest::SetUp(); } // Returns full paths of destination file and directory. void GetDestinationPaths(const std::string& prefix, - FilePath* full_file_name, - FilePath* dir) { + base::FilePath* full_file_name, + base::FilePath* dir) { *full_file_name = save_dir_.path().AppendASCII(prefix + ".htm"); *dir = save_dir_.path().AppendASCII(prefix + "_files"); } // Temporary directory we will save pages to. - ScopedTempDir save_dir_; + base::ScopedTempDir save_dir_; }; // Create a SavePackage and delete it without calling Init. @@ -37,7 +37,7 @@ IN_PROC_BROWSER_TEST_F(SavePackageBrowserTest, ImplicitCancel) { ASSERT_TRUE(test_server()->Start()); GURL url = test_server()->GetURL(kTestFile); NavigateToURL(shell(), url); - FilePath full_file_name, dir; + base::FilePath full_file_name, dir; GetDestinationPaths("a", &full_file_name, &dir); scoped_refptr<SavePackage> save_package(new SavePackage( shell()->web_contents(), SAVE_PAGE_TYPE_AS_ONLY_HTML, full_file_name, @@ -51,7 +51,7 @@ IN_PROC_BROWSER_TEST_F(SavePackageBrowserTest, ExplicitCancel) { ASSERT_TRUE(test_server()->Start()); GURL url = test_server()->GetURL(kTestFile); NavigateToURL(shell(), url); - FilePath full_file_name, dir; + base::FilePath full_file_name, dir; GetDestinationPaths("a", &full_file_name, &dir); scoped_refptr<SavePackage> save_package(new SavePackage( shell()->web_contents(), SAVE_PAGE_TYPE_AS_ONLY_HTML, full_file_name, |