Use a direct include of strings headers in chrome_frame/.

chrome_frame/test_utils.h

 // 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.
 
 #ifndef CHROME_FRAME_TEST_UTILS_H_
 #define CHROME_FRAME_TEST_UTILS_H_
 
 #include <string>
 
 #include <atlbase.h>
 #include <atlcom.h>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 class FilePath;
 }
 
 extern const wchar_t kChromeFrameDllName[];
 extern const wchar_t kChromeLauncherExeName[];
 
 // Helper class used to register different chrome frame DLLs while running
 // tests. The default constructor registers the DLL found in the build path.
@@ skipping 101 matching lines @@
   }
 
   T* owner_;
   Method method_;
 };
 
 // If the workstation is locked and cannot receive user input.
 bool IsWorkstationLocked();
 
 #endif  // CHROME_FRAME_TEST_UTILS_H_