Correctly using ContentWindowController. Fixed loading / restoring of sessions.

Some unit tests are still failing.

Change-Id: Iead2496ce63d023a13cdbc6581d02ad8f6eff7bc