Rollback option put behind the flag.

BUG=368860

Review URL: https://codereview.chromium.org/267393011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269753 0039d316-1c4b-4281-b951-d872f2087c98
  virtual ~ResetTest() {}

  virtual ~ResetTest() {}
