Merge pull request #22863 from KevinGrandon/bug_1053626_search_legazy…

…_moz_activity_removal

Bug 1053626 - [Search] Remove legacy MozActivity calls

apps/search/js/search.js

@@ -308,16 +308,6 @@
      */
     navigate: function(url) {
       window.open(url, '_blank', 'remote=true');
-      /*
-      Bug 1042012: Disabled until we enable registering of the view activity
-      to the system app.
-      var activity = new window.MozActivity({name: 'view', data: {
-        type: 'url',
-        url: url
-      }});
-      // Keep jshint happy
-      activity.onsuccess = function() {};
-      */
     },
 
     /**

apps/search/test/unit/search_test.js

@@ -1,6 +1,6 @@
 'use strict';
 /* global MockNavigatormozApps, MockNavigatormozSetMessageHandler,
-          MockMozActivity, Search, MockProvider, MockasyncStorage, Promise */
+          Search, MockProvider, MockasyncStorage, Promise */
 
 require('/shared/test/unit/mocks/mock_navigator_moz_apps.js');
 require('/shared/test/unit/mocks/mock_navigator_moz_set_message_handler.js');
@@ -14,7 +14,6 @@ requireApp('search/test/unit/mock_provider.js');
 suite('search/search', function() {
   var realAsyncStorage;
   var realMozApps;
-  var realMozActivity;
   var realSetMessageHandler;
   var clock;
 
@@ -31,9 +30,6 @@ suite('search/search', function() {
     realMozApps = navigator.mozApps;
     navigator.mozApps = MockNavigatormozApps;
 
-    realMozActivity = window.MozActivity;
-    window.MozActivity = MockMozActivity;
-
     realAsyncStorage = window.asyncStorage;
     window.asyncStorage = MockasyncStorage;
 
@@ -57,20 +53,16 @@ suite('search/search', function() {
   suiteTeardown(function() {
     navigator.mozSetMessageHandler = realSetMessageHandler;
     navigator.mozApps = realMozApps;
-    window.MozActivity = realMozActivity;
     window.asyncStorage = realAsyncStorage;
     clock.restore();
     delete window.SettingsListener;
   });
 
   setup(function() {
-
-    MockMozActivity.mSetup();
     MockNavigatormozSetMessageHandler.mSetup();
   });
 
   teardown(function() {
-    MockMozActivity.mTeardown();
     MockNavigatormozSetMessageHandler.mTeardown();
     MockNavigatormozApps.mTeardown();
   });
@@ -268,13 +260,6 @@ suite('search/search', function() {
       var stub = this.sinon.stub(window, 'open');
       Search.navigate(url);
       assert.ok(stub.calledOnce);
-      // Bug 1042012: Disabled until we enable registering of the view activity
-      /*
-      var url = 'http://mozilla.org';
-      assert.equal(MockMozActivity.calls.length, 0);
-      Search.navigate(url);
-      assert.equal(MockMozActivity.calls.length, 1);
-      */
     });
   });