Upstream oodles of Chrome for Android code into Chromium.

chrome/android/javatests/src/org/chromium/chrome/browser/omaha/StringSanitizerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/omaha/StringSanitizerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omaha/StringSanitizerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omaha/StringSanitizerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..bc5fd346d4c4191af7aba5529a80eebc14a9c318
--- /dev/null
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/omaha/StringSanitizerTest.java
@@ -0,0 +1,23 @@
+// 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 android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import org.chromium.base.test.util.Feature;
+
+/** Tests the Omaha StringSanitizer. */
+public class StringSanitizerTest extends InstrumentationTestCase {
+    @SmallTest
+    @Feature({"Omaha"})
+    public void testSanitizeStrings() {
+        assertEquals("normal string", StringSanitizer.sanitize("Normal string"));
+        assertEquals("extra spaces string",
+                StringSanitizer.sanitize("\nExtra,  spaces;  string "));
+        assertEquals("a quick brown fox jumped over the lazy dog",
+                StringSanitizer.sanitize("  a\"quick;  brown,fox'jumped;over \nthe\rlazy\tdog\n"));
+    }
+}