Use a direct include of strings headers in base/.

base/win/scoped_bstr.h

 // Copyright (c) 2011 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 BASE_WIN_SCOPED_BSTR_H_
 #define BASE_WIN_SCOPED_BSTR_H_
 
 #include <windows.h>
 #include <oleauto.h>
 
 #include "base/base_export.h"
 #include "base/logging.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 namespace win {
 
 // Manages a BSTR string pointer.
 // The class interface is based on scoped_ptr.
 class BASE_EXPORT ScopedBstr {
  public:
   ScopedBstr() : bstr_(NULL) {
   }
@@ skipping 64 matching lines @@
   // BSTR owned by two different scoped_ptrs.
   bool operator==(const ScopedBstr& bstr2) const;
   bool operator!=(const ScopedBstr& bstr2) const;
   DISALLOW_COPY_AND_ASSIGN(ScopedBstr);
 };
 
 }  // namespace win
 }  // namespace base
 
 #endif  // BASE_SCOPED_BSTR_H_