Use a direct include of strings headers, delete some strings forwarding headers.

content/browser/accessibility/browser_accessibility_android.cc

 // Copyright 2013 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 "content/browser/accessibility/browser_accessibility_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
 #include "content/common/accessibility_messages.h"
 #include "content/common/accessibility_node_data.h"
 
 using base::android::ScopedJavaLocalRef;
 
 namespace content {
 
 // static
 BrowserAccessibility* BrowserAccessibility::Create() {
@@ skipping 503 matching lines @@
     cached_text_ = text;
   }
 }
 
 bool RegisterBrowserAccessibility(JNIEnv* env) {
   // TODO(aboxhall): replace with non-stub implementation
   return false;
 }
 
 }  // namespace content