Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / prerender / prerender_resource_throttle.cc

diff --git a/src/chrome/browser/prerender/prerender_resource_throttle.cc b/src/chrome/browser/prerender/prerender_resource_throttle.cc
index 5636de8..70e1aee 100644 (file)
--- a/src/chrome/browser/prerender/prerender_resource_throttle.cc
+++ b/src/chrome/browser/prerender/prerender_resource_throttle.cc
@@ -14,6 +14,8 @@
 #include "content/public/browser/web_contents.h"
 #include "net/url_request/url_request.h"
 
+using content::ResourceType;
+
 namespace prerender {
 
 namespace {
@@ -76,7 +78,7 @@ void PrerenderResourceThrottle::Cancel() {
 void PrerenderResourceThrottle::WillStartRequestOnUI(
     const base::WeakPtr<PrerenderResourceThrottle>& throttle,
     const std::string& method,
-    ResourceType::Type resource_type,
+    ResourceType resource_type,
     int render_process_id,
     int render_frame_id,
     const GURL& url) {
@@ -94,7 +96,7 @@ void PrerenderResourceThrottle::WillStartRequestOnUI(
       ReportUnsupportedPrerenderScheme(url);
       cancel = true;
 #if defined(OS_ANDROID)
-    } else if (resource_type == ResourceType::FAVICON) {
+    } else if (resource_type == content::RESOURCE_TYPE_FAVICON) {
       // Delay icon fetching until the contents are getting swapped in
       // to conserve network usage in mobile devices.
       prerender_contents->AddResourceThrottle(throttle);
@@ -113,7 +115,7 @@ void PrerenderResourceThrottle::WillStartRequestOnUI(
 void PrerenderResourceThrottle::WillRedirectRequestOnUI(
     const base::WeakPtr<PrerenderResourceThrottle>& throttle,
     const std::string& follow_only_when_prerender_shown_header,
-    ResourceType::Type resource_type,
+    ResourceType resource_type,
     bool async,
     int render_process_id,
     int render_frame_id,
@@ -128,7 +130,7 @@ void PrerenderResourceThrottle::WillRedirectRequestOnUI(
       ReportUnsupportedPrerenderScheme(new_url);
       cancel = true;
     } else if (follow_only_when_prerender_shown_header == "1" &&
-               resource_type != ResourceType::MAIN_FRAME) {
+               resource_type != content::RESOURCE_TYPE_MAIN_FRAME) {
       // Only defer redirects with the Follow-Only-When-Prerender-Shown
       // header. Do not defer redirects on main frame loads.
       if (!async) {