Merge NavigationController and NavigationControllerBase for test_shell. I also removed all the inapplicable crap that was in there like transition and tab types.

BUG=1319488

git-svn-id: svn://svn.chromium.org/chrome/trunk@1120 0039d316-1c4b-4281-b951-d872f2087c98
12 files changed
tree: 55c1252332f92a01ee31a38072828f7281858501
  1. deps/
  2. src/