| Index: content/browser/web_contents/web_contents_impl.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
| index c235923fedf920cdb14b02f96f22120022a5873e..287d01681cda15a27dfb693ec2606c1838bdc8cf 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -22,7 +22,6 @@
|
| #include "base/time/time.h"
|
| #include "base/trace_event/trace_event.h"
|
| #include "components/mime_util/mime_util.h"
|
| -#include "components/url_formatter/url_formatter.h"
|
| #include "content/browser/accessibility/accessibility_mode_helper.h"
|
| #include "content/browser/accessibility/browser_accessibility_state_impl.h"
|
| #include "content/browser/bad_message.h"
|
| @@ -102,6 +101,7 @@
|
| #include "content/public/common/web_preferences.h"
|
| #include "mojo/common/url_type_converters.h"
|
| #include "mojo/converters/geometry/geometry_type_converters.h"
|
| +#include "net/base/net_util.h"
|
| #include "net/http/http_cache.h"
|
| #include "net/http/http_transaction_factory.h"
|
| #include "net/url_request/url_request_context.h"
|
| @@ -4250,9 +4250,9 @@
|
| load_state_ = load_state;
|
| upload_position_ = upload_position;
|
| upload_size_ = upload_size;
|
| - load_state_host_ = url_formatter::IDNToUnicode(
|
| - url.host(),
|
| - GetContentClient()->browser()->GetAcceptLangs(GetBrowserContext()));
|
| + load_state_host_ = net::IDNToUnicode(url.host(),
|
| + GetContentClient()->browser()->GetAcceptLangs(
|
| + GetBrowserContext()));
|
| if (load_state_.state == net::LOAD_STATE_READING_RESPONSE)
|
| SetNotWaitingForResponse();
|
| if (IsLoading()) {
|
|
|