Escape search terms correctly in the path portion of a custom search engine.

content/browser/accessibility/browser_accessibility_win.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 "content/browser/accessibility/browser_accessibility_win.h"
 
 #include <UIAutomationClient.h>
 #include <UIAutomationCoreApi.h>
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/enum_variant.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "content/browser/accessibility/browser_accessibility_manager_win.h"
 #include "content/common/accessibility_messages.h"
-#include "net/base/escape.h"
 #include "ui/base/accessibility/accessible_text_utils.h"
 #include "ui/base/win/accessibility_misc_utils.h"
 
 using webkit_glue::WebAccessibility;
 
 // The GUID for the ISimpleDOM service is not defined in the IDL files.
 // This is taken directly from the Mozilla sources
 // (accessible/src/msaa/nsAccessNodeWrap.cpp) and it's also documented at:
 // http://developer.mozilla.org/en/Accessibility/AT-APIs/ImplementationFeatures/MSAA
 
@@ skipping 2861 matching lines @@
 }
 
 void BrowserAccessibilityWin::IntAttributeToIA2(
     WebAccessibility::IntAttribute attribute, const char* ia2_attr) {
   int value;
   if (GetIntAttribute(attribute, &value))
     ia2_attributes_.push_back(ASCIIToUTF16(ia2_attr) + L":" +
                               base::IntToString16(value));
 }
 
-string16 BrowserAccessibilityWin::Escape(const string16& str) {
-  return net::EscapeQueryParamValueUTF8(str, false);
-}
-
 const string16& BrowserAccessibilityWin::TextForIAccessibleText() {
   if (IsEditableText()) {
     return value_;
   } else if (role_ == WebAccessibility::ROLE_STATIC_TEXT) {
     return name_;
   } else {
     return hypertext_;
   }
 }
 
@@ skipping 473 matching lines @@
   }
 
   // The role should always be set.
   DCHECK(!role_name_.empty() || ia_role_);
 
   // If we didn't explicitly set the IAccessible2 role, make it the same
   // as the MSAA role.
   if (!ia2_role_)
     ia2_role_ = ia_role_;
 }