Use a direct include of strings headers in chrome_frame/.

chrome_frame/test/test_scrubber.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // The test scrubber uses a Google Test event listener to trigger scrubs.
 // Scrubs are performed at the start of the test program and at the conclusion
 // of each test.
 
 #include "chrome_frame/test/test_scrubber.h"
 
 #include <windows.h>
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/process_util.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_process_killer_win.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chrome_frame_test {
@@ skipping 108 matching lines @@
 
 void OverrideDataDirectoryForThisTest(
     const base::StringPiece16& user_data_dir) {
   // Must be called within the context of a test.
   DCHECK(testing::UnitTest::GetInstance()->current_test_info());
 
   g_scrubber.Get().set_data_directory_override(user_data_dir);
 }
 
 }  // namespace chrome_frame_test