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

chrome/browser/google_apis/drive_api_util.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/drive_api_util.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/google_apis/drive_switches.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "third_party/re2/re2/re2.h"
 
 namespace google_apis {
 namespace util {
 
 bool IsDriveV2ApiEnabled() {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
@@ skipping 104 matching lines @@
   std::string stripped_resource_id;
   if (RE2::FullMatch(resource_id, "^[a-z-]+(?::|%3A)([\\w-]+)$",
                      &stripped_resource_id))
     return stripped_resource_id;
   return resource_id;
 }
 
 }  // namespace util
 }  // namespace drive
 }  // namespace google_apis