| Index: content/browser/browser_plugin/browser_plugin_host_browsertest.cc
|
| diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
|
| index ff4cb1ee782b39817093f5d9f19cc02570a43db5..a31a38d1f8925ae5f96f5d7d466195dfba3e3847 100644
|
| --- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
|
| +++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
|
| @@ -7,8 +7,8 @@
|
| #include "base/run_loop.h"
|
| #include "base/string_util.h"
|
| #include "base/strings/string_split.h"
|
| +#include "base/strings/utf_string_conversions.h"
|
| #include "base/test/test_timeouts.h"
|
| -#include "base/utf_string_conversions.h"
|
| #include "content/browser/browser_plugin/browser_plugin_guest.h"
|
| #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
|
| #include "content/browser/browser_plugin/test_browser_plugin_embedder.h"
|
| @@ -30,8 +30,8 @@
|
| #include "content/test/content_browser_test_utils.h"
|
| #include "net/base/net_util.h"
|
| #include "net/test/embedded_test_server/embedded_test_server.h"
|
| -#include "net/test/embedded_test_server/http_response.h"
|
| #include "net/test/embedded_test_server/http_request.h"
|
| +#include "net/test/embedded_test_server/http_response.h"
|
| #include "net/test/spawned_test_server/spawned_test_server.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
|
| #include "webkit/common/webdropdata.h"
|
|
|