Bug 826381 - Update sumo bookmark url. r=mfinkle a=akeybl
authorWes Johnston <wjohnston@mozilla.com>
Sat, 05 Jan 2013 09:54:33 -0800
changeset 122499 f98ccdeee9d33c7ca57ccc3ae9dbd4ee2e56ac64
parent 122498 64d3999a9272308a95f200e5be9cbd5c8d922ce4
child 122500 f7efbe5afafe387088a8653c8f60403300d3daaf
push id1997
push userakeybl@mozilla.com
push dateMon, 07 Jan 2013 21:25:26 +0000
treeherdermozilla-beta@4baf45cdcf21 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle, akeybl
bugs826381
milestone19.0a2
Bug 826381 - Update sumo bookmark url. r=mfinkle a=akeybl
mobile/android/base/strings.xml.in
mobile/android/base/tests/testAllPagesTab.java.in
mobile/android/base/tests/testBookmark.java.in
mobile/android/base/tests/testBookmarksTab.java.in
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -201,17 +201,17 @@
        profile/bookmarks.inc. Don't expose the URLs to L10N. -->
   <string name="bookmarkdefaults_title_aboutfirefox">@bookmarks_aboutBrowser@</string>
   <string name="bookmarkdefaults_url_aboutfirefox">about:firefox</string>
 
   <string name="bookmarkdefaults_title_addons">@bookmarks_addons@</string>
   <string name="bookmarkdefaults_url_addons">https://addons.mozilla.org/@AB_CD@/android/</string>
 
   <string name="bookmarkdefaults_title_support">@bookmarks_support@</string>
-  <string name="bookmarkdefaults_url_support">http://support.mozilla.org/@AB_CD@/mobile</string>
+  <string name="bookmarkdefaults_url_support">http://support.mozilla.org/@AB_CD@/products/mobile</string>
 
   <string name="bookmarkdefaults_title_abouthome">@bookmarks_aboutHome@</string>
   <string name="bookmarkdefaults_url_abouthome">about:home</string>
 
   <!-- Site identity popup -->
   <string name="identity_connected_to">&identity_connected_to;</string>
   <string name="identity_run_by">&identity_run_by;</string>
 
--- a/mobile/android/base/tests/testAllPagesTab.java.in
+++ b/mobile/android/base/tests/testAllPagesTab.java.in
@@ -31,17 +31,17 @@ import @ANDROID_PACKAGE_NAME@.*;
 public class testAllPagesTab extends BaseTest {
     private static final String ABOUT_HOME_URL = "about:home";
     private static final int WAIT_FOR_CHILD_TIMEOUT = 2000;
     private static ListView listview = null;
 
     private String[] bookmarks = new String[] {
         "about:firefox",
         "about:home",
-        "http://support.mozilla.org/en-US/mobile",
+        "http://support.mozilla.org/en-US/products/mobile",	
         "https://addons.mozilla.org/en-US/android/"
     };
 
     @Override
     protected int getTestType() {
         return TEST_MOCHITEST;
     }
 
--- a/mobile/android/base/tests/testBookmark.java.in
+++ b/mobile/android/base/tests/testBookmark.java.in
@@ -23,17 +23,17 @@ public class testBookmark extends PixelT
 
     private ClassLoader mClassLoader;
     private Method mAddBookmark;
     private Method mRemoveBookmark;
     private Method mIsBookmarked;
     private String[] defaultBookmarks = new String[] {
         "about:firefox",
         "about:home",
-        "http://support.mozilla.org/en-US/mobile",
+        "http://support.mozilla.org/en-US/products/mobile",
         "https://addons.mozilla.org/en-US/android/"
     };
 
     @Override
     protected int getTestType() {
         return TEST_MOCHITEST;
     }
 
--- a/mobile/android/base/tests/testBookmarksTab.java.in
+++ b/mobile/android/base/tests/testBookmarksTab.java.in
@@ -24,22 +24,16 @@ import java.util.ArrayList;
 import java.io.File;
 
 /* Tests opening the bookmarks tab, that items look correct, clicking on an item
    and long tapping on an item
 */
 
 public class testBookmarksTab extends BaseTest {
     private static final int WAIT_FOR_CHILD_TIMEOUT = 2000;
-    private String[] defaultBookmarksUrls = new String[] {
-        "about:firefox",
-        "about:home",
-        "http://support.mozilla.org/en-US/mobile",
-        "https://addons.mozilla.org/en-US/android/"
-    };
     private View mFirstChild;
 
     @Override
     protected int getTestType() {
         return TEST_MOCHITEST;
     }
 
     public void testBookmarksTab() {