Move destruction of FilePathWatcherFactory from WatchingFileReader dtor to Cancel()

This addresses flakiness in the unittest.

BUG=96042
TEST=./net_unittests --gtest_filter=WatchingFileReaderTest.FilePathWatcherFailures


Review URL: http://codereview.chromium.org/7867032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101056 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 1 deletions

diff --git a/net/dns/watching_file_reader.cc b/net/dns/watching_file_reader.cc
index b5f9159..633f3aa 100644
--- a/net/dns/watching_file_reader.cc
+++ b/net/dns/watching_file_reader.cc
@@ -47,6 +47,8 @@ void WatchingFileReader::Cancel() {
   cancelled_ = true;
   // Let go of the watcher to break the reference cycle.
   watcher_.reset();
+  // Destroy the non-thread-safe factory now, since dtor is non-thread-safe.
+  factory_.reset();
 }
 
 void WatchingFileReader::OnFilePathChanged(const FilePath& path) {
@@ -59,7 +61,9 @@ void WatchingFileReader::OnFilePathError(const FilePath& path) {
   RestartWatch();
 }
 
-WatchingFileReader::~WatchingFileReader() {}
+WatchingFileReader::~WatchingFileReader() {
+  DCHECK(cancelled_);
+}
 
 void WatchingFileReader::RescheduleWatch() {
   DCHECK(message_loop_->BelongsToCurrentThread());