Bug 826931 - Part 2-2/3: support LineWatcher