I imagine they will just lower the income threshold at which you can collect OAP well before they income test CPP. Perhaps even to the extent of doing away with it completely if you have CPP or  private pension income. OAP will be turned into seniors welfare, and unless you qualify for welfare, then you need not apply for the OAP.