| 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 f25839f95141ab9a65085dbc31a3a06328a4ff9b..382f4eec43d3d0888eedf70d954157a61c29cd56 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -13,9 +13,9 @@
|
| #include "base/string16.h"
|
| #include "base/string_number_conversions.h"
|
| #include "base/string_util.h"
|
| +#include "base/strings/utf_string_conversions.h"
|
| #include "base/sys_info.h"
|
| #include "base/time.h"
|
| -#include "base/utf_string_conversions.h"
|
| #include "cc/base/switches.h"
|
| #include "content/browser/browser_plugin/browser_plugin_embedder.h"
|
| #include "content/browser/browser_plugin/browser_plugin_guest.h"
|
| @@ -87,8 +87,8 @@
|
| #include "webkit/common/webpreferences.h"
|
|
|
| #if defined(OS_ANDROID)
|
| -#include "content/public/browser/android/content_view_core.h"
|
| #include "content/browser/android/date_time_chooser_android.h"
|
| +#include "content/public/browser/android/content_view_core.h"
|
| #endif
|
|
|
| #if defined(OS_MACOSX)
|
|
|