External api fix for bug 99019. r=neil, a=jcranmer

CLOSED TREE

mail/test/mozmill/subscribe/test-subscribe-news-filter.js

@@ -4,19 +4,16 @@
 
 /* Test that the subscribe window for news servers has working autocomplete. */
 
-var MODULE_NAME = 'test-subscribe-news-autocomplete';
+const MODULE_NAME = "test-subscribe-news-filter";
 
-var RELATIVE_ROOT = '../shared-modules';
-var MODULE_REQUIRES = ['folder-display-helpers', 'nntp-helpers',
-                       'subscribe-window-helpers'];
+const RELATIVE_ROOT = "../shared-modules";
+const MODULE_REQUIRES = ["folder-display-helpers", "nntp-helpers",
+                         "subscribe-window-helpers"];
 
 function setupModule(module) {
-  let fdh = collector.getModule('folder-display-helpers');
-  fdh.installInto(module);
-  let nh = collector.getModule('nntp-helpers');
-  nh.installInto(module);
-  let swh = collector.getModule('subscribe-window-helpers');
-  swh.installInto(module);
+  collector.getModule("folder-display-helpers").installInto(module);
+  collector.getModule("nntp-helpers").installInto(module);
+  collector.getModule("subscribe-window-helpers").installInto(module);
 }
 
 /**

mailnews/news/src/nsNntpIncomingServer.cpp

@@ -1654,7 +1654,7 @@ NS_IMETHODIMP
 nsNntpIncomingServer::SetSearchValue(const nsAString &aSearchValue)
 {
   nsCString searchValue = NS_ConvertUTF16toUTF8(aSearchValue);
-  searchValue.CompressWhitespace(true, true);
+  MsgCompressWhitespace(searchValue);
 
   if (mTree) {
     mTree->BeginUpdateBatch();
@@ -1672,10 +1672,7 @@ nsNntpIncomingServer::SetSearchValue(const nsAString &aSearchValue)
     // check that all parts of the search string occur
     bool found = true;
     for (uint32_t j = 0; j < searchStringParts.Length(); ++j) {
-      nsCString::const_iterator start, end;
-      mGroupsOnServer[i].BeginReading(start);
-      mGroupsOnServer[i].EndReading(end);
-      if (!CaseInsensitiveFindInReadable(searchStringParts[j], start, end)){
+      if (mGroupsOnServer[i].Find(searchStringParts[j], CaseInsensitiveCompare)) {
         found = false;
         break;
       }