Bug 693389 - Update urlclassifier DB for Mozilla com->org move. r=dcamp

browser/components/safebrowsing/content/malware-warden.js

@@ -57,14 +57,14 @@ function PROT_MalwareWarden() {
   this.prefs_.addObserver(kMalwareWardenEnabledPref, malwareWardenPrefObserver);
 
   // Add a test chunk to the database
-  var testData = "mozilla.com/firefox/its-an-attack.html";
+  var testData = "mozilla.org/firefox/its-an-attack.html";
 
   var testUpdate =
     "n:1000\ni:test-malware-simple\nad:1\n" +
     "a:1:32:" + testData.length + "\n" +
     testData;
     
-  testData = "mozilla.com/firefox/its-a-trap.html";
+  testData = "mozilla.org/firefox/its-a-trap.html";
   testUpdate +=
     "n:1000\ni:test-phish-simple\nad:1\n" +
     "a:1:32:" + testData.length + "\n" +

browser/components/safebrowsing/content/test/browser_bug400731.js

@@ -8,7 +8,7 @@ function test() {
   // Navigate to malware site.  Can't use an onload listener here since
   // error pages don't fire onload
   window.addEventListener("DOMContentLoaded", testMalware, true);
-  content.location = "http://www.mozilla.com/firefox/its-an-attack.html";
+  content.location = "http://www.mozilla.org/firefox/its-an-attack.html";
 }
 
 function testMalware() {
@@ -23,7 +23,7 @@ function testMalware() {
   
   // Now launch the phishing test
   window.addEventListener("DOMContentLoaded", testPhishing, true);
-  content.location = "http://www.mozilla.com/firefox/its-a-trap.html";
+  content.location = "http://www.mozilla.org/firefox/its-a-trap.html";
 }
 
 function testPhishing() {

browser/components/safebrowsing/content/test/browser_bug415846.js

@@ -37,7 +37,7 @@ function testNormal_PopupListener() {
   
   // Now launch the phishing test.  Can't use onload here because error pages don't
   // fire normal load events.
-  content.location = "http://www.mozilla.com/firefox/its-a-trap.html";
+  content.location = "http://www.mozilla.org/firefox/its-a-trap.html";
   setTimeout(testPhishing, 2000);
 }
 

build/pgo/server-locations.txt

@@ -135,7 +135,7 @@ http://fxfeeds.mozilla.com:80
 
 # Prevent safebrowsing tests from hitting the network for its-a-trap.html and
 # its-an-attack.html.
-http://www.mozilla.com:80
+http://www.mozilla.org:80
 
 #
 # These are subdomains of <ält.example.org>.

mobile/components/SafeBrowsing.js

@@ -101,13 +101,13 @@ SafeBrowsing.prototype = {
     this.listManager = Cc["@mozilla.org/url-classifier/listmanager;1"].getService(Ci.nsIUrlListManager);
 
     // Add a test chunk to the database
-    let testData = "mozilla.com/firefox/its-an-attack.html";
+    let testData = "mozilla.org/firefox/its-an-attack.html";
     let testUpdate =
       "n:1000\ni:test-malware-simple\nad:1\n" +
       "a:1:32:" + testData.length + "\n" +
       testData;
 
-    testData = "mozilla.com/firefox/its-a-trap.html";
+    testData = "mozilla.org/firefox/its-a-trap.html";
     testUpdate +=
       "n:1000\ni:test-phish-simple\nad:1\n" +
       "a:1:32:" + testData.length + "\n" +