Use a direct include of utf_string_conversions.h in chrome/browser/, part 2.

chrome/browser/history/text_database.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 <limits>
 #include <set>
 #include <string>
 
 #include "chrome/browser/history/text_database.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 
 // There are two tables in each database, one full-text search (FTS) table which
 // indexes the contents and title of the pages. The other is a regular SQLITE
 // table which contains non-indexed information about the page. All columns of
 // a FTS table are indexed using the text search algorithm, which isn't what we
 // want for things like times. If this were in the FTS table, there would be
 // different words in the index for each time number.
@@ skipping 318 matching lines @@
 
     // Compute the snippet based on those matches.
     std::string body = statement.ColumnString(4);
     match.snippet.ComputeSnippet(match_positions, body);
   }
   statement.Reset(true);
   return result_count > options.EffectiveMaxCount();
 }
 
 }  // namespace history