Fixes expected models in destroy
As part of the fallout from the great model unification of '13, destroying ghost
services in the service inspector stopped working. This was because it was
expecting `charm` when `browser-charm` is actually passed.
R=rharding, jeff.pihach
CC=
https://codereview.appspot.com/12795046