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

chrome/browser/importer/firefox_importer_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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/files/file_path.h"
 #include "base/path_service.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/importer/firefox_importer_unittest_utils.h"
 #include "chrome/browser/importer/nss_decryptor.h"
 #include "chrome/common/chrome_paths.h"
 
 // TODO(jschuh): Disabled on Win64 build. http://crbug.com/179688
 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
 #define MAYBE_NSS(x) DISABLED_##x
 #else
 #define MAYBE_NSS(x) x
 #endif
@@ skipping 18 matching lines @@
 
   ASSERT_TRUE(decryptor_proxy.DecryptorInit(nss_path, db_path));
   EXPECT_EQ(ASCIIToUTF16("hello"),
       decryptor_proxy.Decrypt("MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECKa"
                               "jtRg4qFSHBAhv9luFkXgDJA=="));
   // Test UTF-16 encoding.
   EXPECT_EQ(WideToUTF16(L"\x4E2D"),
       decryptor_proxy.Decrypt("MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECLW"
                               "qqiccfQHWBAie74hxnULxlw=="));
 }