diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 21:45:42 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 21:45:42 +0000 |
| commit | 237e6d03c2c9371665dd9ff73407e0ae3f8c3ade (patch) | |
| tree | f8d6d213207f68ab55e5339f2c0729904f318ccf /chrome/browser/history/history.h | |
| parent | 47af65f00a6d9606b6d31a09e4562d59a83f2598 (diff) | |
| download | chromium_src-237e6d03c2c9371665dd9ff73407e0ae3f8c3ade.zip chromium_src-237e6d03c2c9371665dd9ff73407e0ae3f8c3ade.tar.gz chromium_src-237e6d03c2c9371665dd9ff73407e0ae3f8c3ade.tar.bz2 | |
Attempt at fixing unit_test crash on mac bots. The main egregious
error I noticed is that ProfileManagerTest was leaking two history
services. I don't know how this would cause the crash though. I also
added the thread_ checks to HistoryService as it's possible for the
HistoryService to be used after Cleanup (processing
notifications). And I removed the registration of the listener in
History() as it doesn't appear to be needed, and if needed results in
listening to too much.
BUG=61982
TEST=none
Review URL: http://codereview.chromium.org/4534001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/history.h')
| -rw-r--r-- | chrome/browser/history/history.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h index 2794565..2aa59ad 100644 --- a/chrome/browser/history/history.h +++ b/chrome/browser/history/history.h @@ -826,7 +826,8 @@ class HistoryService : public CancelableRequestProvider, // when done. We use this internal consumer for this purpose. CancelableRequestConsumer internal_consumer_; - // The thread used by the history service to run complicated operations + // The thread used by the history service to run complicated operations. + // |thread_| is NULL once |Cleanup| is NULL. base::Thread* thread_; // This class has most of the implementation and runs on the 'thread_'. |