Fix GetChannel interface misuse and Windows version logic in ThreadWatcher and
ShutdownWatcher.
GetChannel can return CHANNEL_STABLE, CHANNEL_BETA, CHANNEL_DEV,
CHANNEL_CANARY, or CHANNEL_UNKNOWN. CHANNEL_UNKNOWN generally means "not
Google Chrome", that is, Chromium. The existing code ignored the possibility
of CHANNEL_UNKNOWN. Its mishandling of CHANNEL_STABLE resulted in fragile
code.
The existing code also doubled the timeouts on Windows XP only on certain
channels, although the intent was to double them on Windows XP regardless of
channel.
BUG=96155,95506,90095
TEST=none
Review URL: http://codereview.chromium.org/7780022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100601 0039d316-1c4b-4281-b951-d872f2087c98
1 file changed