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

chrome/browser/ui/omnibox/omnibox_view.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.
 
 // This file defines the interface class OmniboxView.  Each toolkit will
 // implement the edit view differently, so that code is inherently platform
 // specific.  However, the OmniboxEditModel needs to do some communication with
 // the view.  Since the model is shared between platforms, we need to define an
 // interface that all view implementations will share.
 
 #ifndef CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_VIEW_H_
 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_VIEW_H_
 
 #include <string>
 
-#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 "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "content/public/common/url_constants.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/native_widget_types.h"
 
 class CommandUpdater;
 class GURL;
@@ skipping 231 matching lines @@
   scoped_ptr<OmniboxEditModel> model_;
   OmniboxEditController* controller_;
   ToolbarModel* toolbar_model_;
 
   // The object that handles additional command functionality exposed on the
   // edit, such as invoking the keyword editor.
   CommandUpdater* command_updater_;
 };
 
 #endif  // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_VIEW_H_