Revert "Bug 1039955 - Fix direct circular activity by closing front w…

…indows"

This reverts commit b75c7fd.

apps/system/js/app_window_manager.js

@@ -656,12 +656,8 @@
       var caller;
       var callee = this.getApp(config.origin);
       caller = this._activeApp.getTopMostWindow();
-      if (caller.getBottomMostWindow() === callee) {
-        callee.frontWindow.kill();
-      } else {
-        callee.callerWindow = caller;
-        caller.calleeWindow = callee;
-      }
+      callee.callerWindow = caller;
+      caller.calleeWindow = callee;
     },
 
     debug: function awm_debug() {

apps/system/test/unit/app_window_manager_test.js

@@ -758,6 +758,7 @@ suite('system/AppWindowManager', function() {
         // callee is app7, caller is app2
         injectRunningApps(app7);
         AppWindowManager._activeApp = app1;
+        fakeAppConfig.parentApp = '';
         this.sinon.stub(app1, 'getTopMostWindow').returns(app2);
 
         AppWindowManager.linkWindowActivity(fakeAppConfig);
@@ -766,25 +767,6 @@ suite('system/AppWindowManager', function() {
         assert.deepEqual(app7.callerWindow, app2);
         assert.isFalse(homescreenLauncher.getHomescreen.called);
     });
-
-    test('If there is a direct circular activity, ' +
-          'close the frontwindow to reveal the callee',
-      function() {
-        // callee is app1, caller is app3(a front window)
-        injectRunningApps(app1);
-        AppWindowManager._activeApp = app1;
-        fakeAppConfig.parentApp = '';
-        app1.frontWindow = app3;
-        this.sinon.stub(app1, 'getTopMostWindow').returns(app3);
-        this.sinon.stub(app3, 'getBottomMostWindow').returns(app1);
-        var stubKill = this.sinon.stub(app3, 'kill');
-
-        AppWindowManager.linkWindowActivity(fakeAppConfig1);
-
-        assert.isTrue(stubKill.called);
-        assert.isUndefined(app1.callerWindow);
-        app1.frontWindow = null;
-    });
   });
 
   test('getApp', function() {