| Index: net/url_request/url_fetcher_impl_unittest.cc
|
| diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc
|
| index a94e8870489f8d40f3b8d64c322adb53d3ece7d1..7f21566d978e18cf9c9988dcaf12ccd1e6c9daf2 100644
|
| --- a/net/url_request/url_fetcher_impl_unittest.cc
|
| +++ b/net/url_request/url_fetcher_impl_unittest.cc
|
| @@ -381,7 +381,12 @@ class URLFetcherMultipleAttemptTest : public URLFetcherTest {
|
| class URLFetcherFileTest : public URLFetcherTest {
|
| public:
|
| URLFetcherFileTest() : take_ownership_of_file_(false),
|
| - expected_file_error_(base::PLATFORM_FILE_OK) {}
|
| + expected_file_error_(base::PLATFORM_FILE_OK) {
|
| + PathService::Get(base::DIR_SOURCE_ROOT, &document_root_);
|
| + document_root_= document_root_.AppendASCII(FILE_PATH_LITERAL("chrome"))
|
| + .AppendASCII(FILE_PATH_LITERAL("test"))
|
| + .AppendASCII(FILE_PATH_LITERAL("data"));
|
| + }
|
|
|
| void CreateFetcherForFile(const GURL& url, const FilePath& file_path);
|
| void CreateFetcherForTempFile(const GURL& url);
|
| @@ -390,6 +395,7 @@ class URLFetcherFileTest : public URLFetcherTest {
|
| virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE;
|
|
|
| protected:
|
| + FilePath document_root_;
|
| FilePath expected_file_;
|
| FilePath file_path_;
|
|
|
| @@ -1087,7 +1093,7 @@ TEST_F(URLFetcherFileTest, SmallGet) {
|
|
|
| // Get a small file.
|
| static const char kFileToFetch[] = "simple.html";
|
| - expected_file_ = test_server.document_root().AppendASCII(kFileToFetch);
|
| + expected_file_ = document_root_.AppendASCII(kFileToFetch);
|
| CreateFetcherForFile(
|
| test_server.GetURL(std::string(kTestServerFilePrefix) + kFileToFetch),
|
| temp_dir.path().AppendASCII(kFileToFetch));
|
| @@ -1110,7 +1116,7 @@ TEST_F(URLFetcherFileTest, LargeGet) {
|
| // Get a file large enough to require more than one read into
|
| // URLFetcher::Core's IOBuffer.
|
| static const char kFileToFetch[] = "animate1.gif";
|
| - expected_file_ = test_server.document_root().AppendASCII(kFileToFetch);
|
| + expected_file_ = document_root_.AppendASCII(kFileToFetch);
|
| CreateFetcherForFile(
|
| test_server.GetURL(std::string(kTestServerFilePrefix) + kFileToFetch),
|
| temp_dir.path().AppendASCII(kFileToFetch));
|
| @@ -1129,7 +1135,7 @@ TEST_F(URLFetcherFileTest, CanTakeOwnershipOfFile) {
|
|
|
| // Get a small file.
|
| static const char kFileToFetch[] = "simple.html";
|
| - expected_file_ = test_server.document_root().AppendASCII(kFileToFetch);
|
| + expected_file_ = document_root_.AppendASCII(kFileToFetch);
|
| CreateFetcherForFile(
|
| test_server.GetURL(std::string(kTestServerFilePrefix) + kFileToFetch),
|
| temp_dir.path().AppendASCII(kFileToFetch));
|
| @@ -1158,7 +1164,7 @@ TEST_F(URLFetcherFileTest, OverwriteExistingFile) {
|
| const int data_size = arraysize(kData);
|
| ASSERT_EQ(file_util::WriteFile(file_path_, kData, data_size), data_size);
|
| ASSERT_TRUE(file_util::PathExists(file_path_));
|
| - expected_file_ = test_server.document_root().AppendASCII(kFileToFetch);
|
| + expected_file_ = document_root_.AppendASCII(kFileToFetch);
|
| ASSERT_FALSE(file_util::ContentsEqual(file_path_, expected_file_));
|
|
|
| // Get a small file.
|
| @@ -1204,7 +1210,7 @@ TEST_F(URLFetcherFileTest, SmallGetToTempFile) {
|
|
|
| // Get a small file.
|
| static const char kFileToFetch[] = "simple.html";
|
| - expected_file_ = test_server.document_root().AppendASCII(kFileToFetch);
|
| + expected_file_ = document_root_.AppendASCII(kFileToFetch);
|
| CreateFetcherForTempFile(
|
| test_server.GetURL(std::string(kTestServerFilePrefix) + kFileToFetch));
|
|
|
| @@ -1223,7 +1229,7 @@ TEST_F(URLFetcherFileTest, LargeGetToTempFile) {
|
| // Get a file large enough to require more than one read into
|
| // URLFetcher::Core's IOBuffer.
|
| static const char kFileToFetch[] = "animate1.gif";
|
| - expected_file_ = test_server.document_root().AppendASCII(kFileToFetch);
|
| + expected_file_ = document_root_.AppendASCII(kFileToFetch);
|
| CreateFetcherForTempFile(test_server.GetURL(
|
| std::string(kTestServerFilePrefix) + kFileToFetch));
|
|
|
| @@ -1238,7 +1244,7 @@ TEST_F(URLFetcherFileTest, CanTakeOwnershipOfTempFile) {
|
|
|
| // Get a small file.
|
| static const char kFileToFetch[] = "simple.html";
|
| - expected_file_ = test_server.document_root().AppendASCII(kFileToFetch);
|
| + expected_file_ = document_root_.AppendASCII(kFileToFetch);
|
| CreateFetcherForTempFile(test_server.GetURL(
|
| std::string(kTestServerFilePrefix) + kFileToFetch));
|
|
|
|
|