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

chrome/browser/google_apis/gdata_wapi_parser_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/google_apis/gdata_wapi_parser.h"
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/path_service.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
-#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/browser/google_apis/time_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Value;
 using base::DictionaryValue;
 using base::ListValue;
 
 namespace google_apis {
@@ skipping 355 matching lines @@
             ResourceEntry::ClassifyEntryKind(ENTRY_KIND_EXTERNAL_APP));
   EXPECT_EQ(ResourceEntry::KIND_OF_FOLDER,
             ResourceEntry::ClassifyEntryKind(ENTRY_KIND_FOLDER));
   EXPECT_EQ(ResourceEntry::KIND_OF_FILE,
             ResourceEntry::ClassifyEntryKind(ENTRY_KIND_FILE));
   EXPECT_EQ(ResourceEntry::KIND_OF_FILE,
             ResourceEntry::ClassifyEntryKind(ENTRY_KIND_PDF));
 }
 
 }  // namespace google_apis