summaryrefslogtreecommitdiffstats
path: root/webkit/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/plugins')
-rw-r--r--webkit/plugins/npapi/plugin_instance.cc2
-rw-r--r--webkit/plugins/npapi/plugin_list_mac.mm2
-rw-r--r--webkit/plugins/npapi/plugin_list_win.cc2
-rw-r--r--webkit/plugins/npapi/test/plugin_geturl_test.cc2
-rw-r--r--webkit/plugins/npapi/test/plugin_test.cc2
-rw-r--r--webkit/plugins/npapi/test/plugin_windowless_test.cc2
-rw-r--r--webkit/plugins/ppapi/plugin_object.cc2
7 files changed, 7 insertions, 7 deletions
diff --git a/webkit/plugins/npapi/plugin_instance.cc b/webkit/plugins/npapi/plugin_instance.cc
index 5891989..0fcdb19 100644
--- a/webkit/plugins/npapi/plugin_instance.cc
+++ b/webkit/plugins/npapi/plugin_instance.cc
@@ -8,7 +8,7 @@
#include "build/build_config.h"
#include "base/file_util.h"
#include "base/message_loop.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
#include "base/utf_string_conversions.h"
#include "net/base/escape.h"
#include "webkit/glue/webkit_glue.h"
diff --git a/webkit/plugins/npapi/plugin_list_mac.mm b/webkit/plugins/npapi/plugin_list_mac.mm
index b8bdc4e..3bdbfc8 100644
--- a/webkit/plugins/npapi/plugin_list_mac.mm
+++ b/webkit/plugins/npapi/plugin_list_mac.mm
@@ -8,8 +8,8 @@
#include "base/file_util.h"
#include "base/mac/mac_util.h"
-#include "base/string_number_conversions.h"
#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/utf_string_conversions.h"
#include "webkit/plugins/npapi/plugin_lib.h"
diff --git a/webkit/plugins/npapi/plugin_list_win.cc b/webkit/plugins/npapi/plugin_list_win.cc
index 4e53953..dd7e036 100644
--- a/webkit/plugins/npapi/plugin_list_win.cc
+++ b/webkit/plugins/npapi/plugin_list_win.cc
@@ -12,8 +12,8 @@
#include "base/files/memory_mapped_file.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
-#include "base/string_number_conversions.h"
#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/win/pe_image.h"
#include "base/win/registry.h"
diff --git a/webkit/plugins/npapi/test/plugin_geturl_test.cc b/webkit/plugins/npapi/test/plugin_geturl_test.cc
index c01cbed..9d66a5d2 100644
--- a/webkit/plugins/npapi/test/plugin_geturl_test.cc
+++ b/webkit/plugins/npapi/test/plugin_geturl_test.cc
@@ -8,8 +8,8 @@
#include "base/basictypes.h"
#include "base/file_util.h"
-#include "base/string_number_conversions.h"
#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
#include "base/utf_string_conversions.h"
// url for "self". The %22%22 is to make a statement for javascript to
diff --git a/webkit/plugins/npapi/test/plugin_test.cc b/webkit/plugins/npapi/test/plugin_test.cc
index 7ba97a2..17a2421 100644
--- a/webkit/plugins/npapi/test/plugin_test.cc
+++ b/webkit/plugins/npapi/test/plugin_test.cc
@@ -4,8 +4,8 @@
#include "webkit/plugins/npapi/test/plugin_test.h"
-#include "base/string_number_conversions.h"
#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
#include "webkit/plugins/npapi/test/npapi_constants.h"
namespace NPAPIClient {
diff --git a/webkit/plugins/npapi/test/plugin_windowless_test.cc b/webkit/plugins/npapi/test/plugin_windowless_test.cc
index 9b6cd00..0a04f8a 100644
--- a/webkit/plugins/npapi/test/plugin_windowless_test.cc
+++ b/webkit/plugins/npapi/test/plugin_windowless_test.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#define STRSAFE_NO_DEPRECATE
-#include "base/string_number_conversions.h"
#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
#include "webkit/plugins/npapi/test/plugin_windowless_test.h"
#include "webkit/plugins/npapi/test/plugin_client.h"
diff --git a/webkit/plugins/ppapi/plugin_object.cc b/webkit/plugins/ppapi/plugin_object.cc
index 61f155b..a5ef5fe 100644
--- a/webkit/plugins/ppapi/plugin_object.cc
+++ b/webkit/plugins/ppapi/plugin_object.cc
@@ -7,8 +7,8 @@
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/string_number_conversions.h"
#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
#include "third_party/npapi/bindings/npapi.h"
#include "third_party/npapi/bindings/npruntime.h"
#include "ppapi/c/dev/ppb_var_deprecated.h"