Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/omaha/StringSanitizer.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/omaha/StringSanitizer.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/omaha/StringSanitizer.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/omaha/StringSanitizer.java
deleted file mode 100644
index fb2ade3aa93515613f3ee8a90ebb75be5ff9dadf..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/omaha/StringSanitizer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015 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.
-
-package org.chromium.chrome.browser.omaha;
-
-import java.util.Locale;
-import java.util.regex.PatternSyntaxException;
-
-/**
- * Sanitizes Strings sent to the Omaha server.
- */
-public class StringSanitizer {
-    static final char[] CHARS_TO_REMOVE = {';', ',', '"', '\'', '\n', '\r', '\t'};
-
-    public static String sanitize(String str) {
-        for (char current : CHARS_TO_REMOVE) {
-            str = str.replace(current, ' ');
-        }
-        try {
-            str = str.replaceAll("  *", " ");
-        } catch (PatternSyntaxException e) {
-            assert false;
-        }
-        str = str.toLowerCase(Locale.US);
-        str = str.trim();
-        return str;
-    }
-}