Use a direct include of utf_string_conversions.h in content/.

content/browser/web_contents/navigation_entry_impl_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 "base/string16.h"
 #include "base/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
-#include "base/utf_string_conversions.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/navigation_entry_impl.h"
 #include "content/public/common/ssl_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 class NavigationEntryTest : public testing::Test {
  public:
   NavigationEntryTest() : instance_(NULL) {
@@ skipping 213 matching lines @@
   // Content in |output| is not modified if data is not present at the key.
   EXPECT_FALSE(entry1_->GetExtraData("search_terms", &output));
   EXPECT_EQ(test_data, output);
   // Using an empty string shows that the data is not present in the map.
   string16 output2;
   EXPECT_FALSE(entry1_->GetExtraData("search_terms", &output2));
   EXPECT_EQ(ASCIIToUTF16(""), output2);
 }
 
 }  // namespace content