#include "net/url_request/url_request_file_job.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/threading/sequenced_worker_pool.h"
#include "net/base/filename_util.h"
#include "net/base/net_util.h"
+#include "net/url_request/url_request.h"
#include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
+namespace net {
+
namespace {
// A URLRequestFileJob for testing OnSeekComplete / OnReadComplete callbacks.
-class URLRequestFileJobWithCallbacks : public net::URLRequestFileJob {
+class URLRequestFileJobWithCallbacks : public URLRequestFileJob {
public:
URLRequestFileJobWithCallbacks(
- net::URLRequest* request,
- net::NetworkDelegate* network_delegate,
+ URLRequest* request,
+ NetworkDelegate* network_delegate,
const base::FilePath& file_path,
const scoped_refptr<base::TaskRunner>& file_task_runner)
: URLRequestFileJob(request,
seek_position_ = result;
}
- virtual void OnReadComplete(net::IOBuffer* buf, int result) OVERRIDE {
+ virtual void OnReadComplete(IOBuffer* buf, int result) OVERRIDE {
data_chunks_.push_back(std::string(buf->data(), result));
}
// A URLRequestJobFactory that will return URLRequestFileJobWithCallbacks
// instances for file:// scheme URLs.
-class CallbacksJobFactory : public net::URLRequestJobFactory {
+class CallbacksJobFactory : public URLRequestJobFactory {
public:
class JobObserver {
public:
virtual ~CallbacksJobFactory() {}
- virtual net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
+ virtual URLRequestJob* MaybeCreateJobWithProtocolHandler(
const std::string& scheme,
- net::URLRequest* request,
- net::NetworkDelegate* network_delegate) const OVERRIDE {
+ URLRequest* request,
+ NetworkDelegate* network_delegate) const OVERRIDE {
URLRequestFileJobWithCallbacks* job = new URLRequestFileJobWithCallbacks(
request,
network_delegate,
void RunRequest(const std::string& content, const Range* range);
JobObserverImpl observer_;
- net::TestURLRequestContext context_;
- net::TestDelegate delegate_;
+ TestURLRequestContext context_;
+ TestDelegate delegate_;
};
URLRequestFileJobEventsTest::URLRequestFileJobEventsTest() {}
CallbacksJobFactory factory(path, &observer_);
context_.set_job_factory(&factory);
- net::TestURLRequest request(net::FilePathToFileURL(path),
- net::DEFAULT_PRIORITY,
- &delegate_,
- &context_);
+ scoped_ptr<URLRequest> request(context_.CreateRequest(
+ FilePathToFileURL(path), DEFAULT_PRIORITY, &delegate_, NULL));
if (range) {
ASSERT_GE(range->start, 0);
ASSERT_GE(range->end, 0);
ASSERT_LT(static_cast<unsigned int>(range->end), content.length());
std::string range_value =
base::StringPrintf("bytes=%d-%d", range->start, range->end);
- request.SetExtraRequestHeaderByName(
- net::HttpRequestHeaders::kRange, range_value, true /*overwrite*/);
+ request->SetExtraRequestHeaderByName(
+ HttpRequestHeaders::kRange, range_value, true /*overwrite*/);
}
- request.Start();
+ request->Start();
base::RunLoop loop;
loop.Run();
observed_content.append(*i);
}
EXPECT_EQ(expected_content, observed_content);
- EXPECT_TRUE(expected_content == observed_content);
}
// Helper function to make a character array filled with |size| bytes of
return result;
}
-} // namespace
-
TEST_F(URLRequestFileJobEventsTest, TinyFile) {
RunRequest(std::string("hello world"), NULL);
}
Range range(1701, (6 * 1024) + 3);
RunRequest(MakeContentOfSize(size), &range);
}
+
+} // namespace
+
+} // namespace net