Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / browser / loader / resource_loader_unittest.cc

diff --git a/src/content/browser/loader/resource_loader_unittest.cc b/src/content/browser/loader/resource_loader_unittest.cc
index d2fdd99..1e489e8 100644 (file)
--- a/src/content/browser/loader/resource_loader_unittest.cc
+++ b/src/content/browser/loader/resource_loader_unittest.cc
@@ -132,7 +132,7 @@ class ResourceHandlerStub : public ResourceHandler {
     return true;
   }
 
-  virtual bool OnRequestRedirected(const GURL& url,
+  virtual bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
                                    ResourceResponse* response,
                                    bool* defer) OVERRIDE {
     NOTREACHED();
@@ -319,7 +319,7 @@ class ResourceLoaderTest : public testing::Test,
                             resource_context_.GetRequestContext()));
     raw_ptr_to_request_ = request.get();
     ResourceRequestInfo::AllocateForTesting(request.get(),
-                                            ResourceType::MAIN_FRAME,
+                                            RESOURCE_TYPE_MAIN_FRAME,
                                             &resource_context_,
                                             kRenderProcessId,
                                             kRenderViewId,