Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / renderer / net / net_error_helper.cc

diff --git a/src/chrome/renderer/net/net_error_helper.cc b/src/chrome/renderer/net/net_error_helper.cc
index 3a85b2d..be5b4d1 100644 (file)
--- a/src/chrome/renderer/net/net_error_helper.cc
+++ b/src/chrome/renderer/net/net_error_helper.cc
@@ -14,10 +14,11 @@
 #include "base/values.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/localized_error.h"
-#include "chrome/common/net/net_error_info.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/grit/renderer_resources.h"
 #include "chrome/renderer/net/net_error_page_controller.h"
+#include "components/error_page/common/error_page_params.h"
+#include "components/error_page/common/net_error_info.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/content_renderer_client.h"
@@ -48,6 +49,8 @@ using content::RenderFrame;
 using content::RenderFrameObserver;
 using content::RenderThread;
 using content::kUnreachableWebDataURL;
+using error_page::ErrorPageParams;
+using error_page::NetErrorHelperCore;
 
 namespace {
 
@@ -165,7 +168,7 @@ void NetErrorHelper::TrackClick(int tracking_id) {
 void NetErrorHelper::GenerateLocalizedErrorPage(
     const blink::WebURLError& error,
     bool is_failed_post,
-    scoped_ptr<LocalizedError::ErrorPageParams> params,
+    scoped_ptr<ErrorPageParams> params,
     bool* reload_button_shown,
     bool* load_stale_button_shown,
     std::string* error_html) const {
@@ -227,7 +230,7 @@ void NetErrorHelper::UpdateErrorPage(const blink::WebURLError& error,
                              RenderThread::Get()->GetLocale(),
                              render_frame()->GetRenderView()->
                                  GetAcceptLanguages(),
-                             scoped_ptr<LocalizedError::ErrorPageParams>(),
+                             scoped_ptr<ErrorPageParams>(),
                              &error_strings);
 
   std::string json;