Move TrimWhitespace to the base namespace.

components/autofill/content/renderer/form_autofill_util.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 "components/autofill/content/renderer/form_autofill_util.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 97 matching lines @@
 //  * CombineAndCollapseWhitespace("foo", " bar", false)      -> "foo bar"
 //  * CombineAndCollapseWhitespace("foo", " bar", true)       -> "foo bar"
 //  * CombineAndCollapseWhitespace("foo   ", "   bar", false) -> "foo bar"
 //  * CombineAndCollapseWhitespace(" foo", "bar ", false)     -> " foobar "
 //  * CombineAndCollapseWhitespace(" foo", "bar ", true)      -> " foo bar "
 const base::string16 CombineAndCollapseWhitespace(
     const base::string16& prefix,
     const base::string16& suffix,
     bool force_whitespace) {
   base::string16 prefix_trimmed;
-  TrimPositions prefix_trailing_whitespace =
-      TrimWhitespace(prefix, TRIM_TRAILING, &prefix_trimmed);
+  base::TrimPositions prefix_trailing_whitespace =
+      base::TrimWhitespace(prefix, base::TRIM_TRAILING, &prefix_trimmed);
 
   // Recursively compute the children's text.
   base::string16 suffix_trimmed;
-  TrimPositions suffix_leading_whitespace =
-      TrimWhitespace(suffix, TRIM_LEADING, &suffix_trimmed);
+  base::TrimPositions suffix_leading_whitespace =
+      base::TrimWhitespace(suffix, base::TRIM_LEADING, &suffix_trimmed);
 
   if (prefix_trailing_whitespace || suffix_leading_whitespace ||
       force_whitespace) {
     return prefix_trimmed + base::ASCIIToUTF16(" ") + suffix_trimmed;
   } else {
     return prefix_trimmed + suffix_trimmed;
   }
 }
 
 // This is a helper function for the FindChildText() function (see below).
@@ skipping 48 matching lines @@
 // |innerText()|, the search depth and breadth are limited to a fixed threshold.
 // Whitespace is trimmed from text accumulated at descendant nodes.
 base::string16 FindChildText(const WebNode& node) {
   if (node.isTextNode())
     return node.nodeValue();
 
   WebNode child = node.firstChild();
 
   const int kChildSearchDepth = 10;
   base::string16 node_text = FindChildTextInner(child, kChildSearchDepth);
-  TrimWhitespace(node_text, TRIM_ALL, &node_text);
+  base::TrimWhitespace(node_text, base::TRIM_ALL, &node_text);
   return node_text;
 }
 
 // Helper for |InferLabelForElement()| that infers a label, if possible, from
 // a previous sibling of |element|,
 // e.g. Some Text <input ...>
 // or   Some <span>Text</span> <input ...>
 // or   <p>Some Text</p><input ...>
 // or   <label>Some Text</label> <input ...>
 // or   Some Text <img><input ...>
@@ skipping 31 matching lines @@
       // A text node's value will be empty if it is for a line break.
       bool add_space = previous.isTextNode() && value.empty();
       inferred_label =
           CombineAndCollapseWhitespace(value, inferred_label, add_space);
       continue;
     }
 
     // If we have identified a partial label and have reached a non-lightweight
     // element, consider the label to be complete.
     base::string16 trimmed_label;
-    TrimWhitespace(inferred_label, TRIM_ALL, &trimmed_label);
+    base::TrimWhitespace(inferred_label, base::TRIM_ALL, &trimmed_label);
     if (!trimmed_label.empty())
       break;
 
     // <img> and <br> tags often appear between the input element and its
     // label text, so skip over them.
     CR_DEFINE_STATIC_LOCAL(WebString, kImage, ("img"));
     CR_DEFINE_STATIC_LOCAL(WebString, kBreak, ("br"));
     if (HasTagName(previous, kImage) || HasTagName(previous, kBreak))
       continue;
 
     // We only expect <p> and <label> tags to contain the full label text.
     CR_DEFINE_STATIC_LOCAL(WebString, kPage, ("p"));
     CR_DEFINE_STATIC_LOCAL(WebString, kLabel, ("label"));
     if (HasTagName(previous, kPage) || HasTagName(previous, kLabel))
       inferred_label = FindChildText(previous);
 
     break;
   }
 
-  TrimWhitespace(inferred_label, TRIM_ALL, &inferred_label);
+  base::TrimWhitespace(inferred_label, base::TRIM_ALL, &inferred_label);
   return inferred_label;
 }
 
 // Helper for |InferLabelForElement()| that infers a label, if possible, from
 // enclosing list item,
 // e.g. <li>Some Text<input ...><input ...><input ...></tr>
 base::string16 InferLabelFromListItem(const WebFormControlElement& element) {
   WebNode parent = element.parentNode();
   CR_DEFINE_STATIC_LOCAL(WebString, kListItem, ("li"));
   while (!parent.isNull() && parent.isElementNode() &&
@@ skipping 905 matching lines @@
 
 gfx::RectF GetScaledBoundingBox(float scale, WebInputElement* element) {
   gfx::Rect bounding_box(element->boundsInViewportSpace());
   return gfx::RectF(bounding_box.x() * scale,
                     bounding_box.y() * scale,
                     bounding_box.width() * scale,
                     bounding_box.height() * scale);
 }
 
 }  // namespace autofill