Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / renderer_host / chrome_resource_dispatcher_host_delegate_browsertest.cc

diff --git a/src/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc b/src/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc
index 982fc38..e504412 100644 (file)
--- a/src/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc
+++ b/src/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc
@@ -40,13 +40,13 @@ scoped_ptr<net::test_server::HttpResponse> HandleTestRequest(
         new net::test_server::BasicHttpResponse);
     http_response->set_code(net::HTTP_MOVED_PERMANENTLY);
     http_response->AddCustomHeader("Location", redirect_target);
-    return http_response.PassAs<net::test_server::HttpResponse>();
+    return http_response.Pass();
   } else {
     scoped_ptr<net::test_server::BasicHttpResponse> http_response(
         new net::test_server::BasicHttpResponse);
     http_response->set_code(net::HTTP_OK);
     http_response->set_content("Success");
-    return http_response.PassAs<net::test_server::HttpResponse>();
+    return http_response.Pass();
   }
 }
 
@@ -57,14 +57,14 @@ class TestDispatcherHostDelegate : public ChromeResourceDispatcherHostDelegate {
       : ChromeResourceDispatcherHostDelegate(prerender_tracker) {
   }
 
-  virtual ~TestDispatcherHostDelegate() {}
+  ~TestDispatcherHostDelegate() override {}
 
-  virtual void RequestBeginning(
+  void RequestBeginning(
       net::URLRequest* request,
       content::ResourceContext* resource_context,
       content::AppCacheService* appcache_service,
       ResourceType resource_type,
-      ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE {
+      ScopedVector<content::ResourceThrottle>* throttles) override {
     ChromeResourceDispatcherHostDelegate::RequestBeginning(
         request,
         resource_context,
@@ -74,11 +74,10 @@ class TestDispatcherHostDelegate : public ChromeResourceDispatcherHostDelegate {
     request_headers_.MergeFrom(request->extra_request_headers());
   }
 
-  virtual void OnRequestRedirected(
-      const GURL& redirect_url,
-      net::URLRequest* request,
-      content::ResourceContext* resource_context,
-      content::ResourceResponse* response) OVERRIDE {
+  void OnRequestRedirected(const GURL& redirect_url,
+                           net::URLRequest* request,
+                           content::ResourceContext* resource_context,
+                           content::ResourceResponse* response) override {
     ChromeResourceDispatcherHostDelegate::OnRequestRedirected(
         redirect_url,
         request,
@@ -100,7 +99,7 @@ class ChromeResourceDispatcherHostDelegateBrowserTest :
  public:
   ChromeResourceDispatcherHostDelegateBrowserTest() {}
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  void SetUpOnMainThread() override {
     InProcessBrowserTest::SetUpOnMainThread();
     // Hook navigations with our delegate.
     dispatcher_host_delegate_.reset(new TestDispatcherHostDelegate(
@@ -130,7 +129,7 @@ class ChromeResourceDispatcherHostDelegateBrowserTest :
     }
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE {
+  void TearDownOnMainThread() override {
     content::ResourceDispatcherHost::Get()->SetDelegate(NULL);
     dispatcher_host_delegate_.reset();
   }