commit 868fa2fe829687343ffae624259930155e16dbd8
author Torne (Richard Coles) <torne@google.com> Tue Jun 11 10:57:03 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Tue Jun 11 10:57:03 2013 +0100
tree 54d316199dd9739c57c3aacd131853bbd6554a94
parent bb1bdbd796f966b5bf11f40ecbea12621c7bfac9

Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540

chrome_frame/chrome_tab.cc

diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index a65c3d7..a0af6e3 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -18,12 +18,12 @@
 #include "base/logging.h"
 #include "base/logging_win.h"
 #include "base/path_service.h"
-#include "base/string16.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string16.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_constants.h"