Use a direct include of strings headers in chrome/browser/ui/b*-p*/.

chrome/browser/ui/omnibox/omnibox_view_unittest.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 "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "base/message_loop.h"
-#include "base/string16.h"
-#include "base/string_util.h"
+#include "base/strings/string16.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 
 namespace {
 
 class OmniboxViewTest : public PlatformTest {
  public:
@@ skipping 112 matching lines @@
                                                ui::Clipboard::BUFFER_STANDARD);
     clipboard_writer.WriteText(kWrappedAddress);
   }
 
   const string16 kFixedAddress(ASCIIToUTF16(
       "1600 Amphitheatre Parkway Mountain View, CA"));
   EXPECT_EQ(kFixedAddress, OmniboxView::GetClipboardText());
 }
 
 }  // namespace