Use a direct include of strings headers in chrome_frame/.

chrome_frame/test/infobar_unittests.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.
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlmisc.h>
 #include <atlwin.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/string_number_conversions.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "testing/gmock/include/gmock/gmock.h"
+#include "base/strings/string_number_conversions.h"
 #include "chrome_frame/infobars/infobar_content.h"
 #include "chrome_frame/infobars/internal/displaced_window_manager.h"
 #include "chrome_frame/infobars/internal/host_window_manager.h"
 #include "chrome_frame/infobars/internal/infobar_window.h"
 #include "chrome_frame/infobars/internal/subclassing_window_with_delegate.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 RECT kInitialParentWindowRect = {20, 20, 300, 300};
 RECT kInitialChildWindowRect = {20, 20, 280, 280};
 
 MATCHER_P(EqualRect, expected, "") {
   return ::EqualRect(expected, arg);
 }
 
@@ skipping 563 matching lines @@
 
   message_loop.RunFor(base::TimeDelta::FromSeconds(10));
 
   window.DestroyWindow();
 
   ASSERT_FALSE(message_loop.WasTimedOut());
 }
 
 // TODO(erikwright): Write test for variations on return from default
 // OnNcCalcValidRects