Rollback r517 to retry with ObjectWatcher. This change did not appear to be

the cause of the page cycler regression.

TBR=jar


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

1 files changed, 5 insertions, 5 deletions

diff --git a/net/url_request/url_request_file_job.h b/net/url_request/url_request_file_job.h
index 349f258..076703f 100644
--- a/net/url_request/url_request_file_job.h
+++ b/net/url_request/url_request_file_job.h
@@ -32,6 +32,7 @@
 
 #include "base/lock.h"
 #include "base/message_loop.h"
+#include "base/object_watcher.h"
 #include "base/thread.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
@@ -39,7 +40,7 @@
 
 // A request job that handles reading file URLs
 class URLRequestFileJob : public URLRequestJob,
-                          protected MessageLoop::Watcher {
+                          public base::ObjectWatcher::Delegate {
  public:
   URLRequestFileJob(URLRequest* request);
   virtual ~URLRequestFileJob();
@@ -62,13 +63,10 @@ class URLRequestFileJob : public URLRequestJob,
   std::wstring file_path_;
 
  private:
-  // The net util test wants to run our FileURLToFilePath function.
-  FRIEND_TEST(NetUtilTest, FileURLConversion);
-
   void CloseHandles();
   void StartAsync();
 
-  // MessageLoop::Watcher callback
+  // base::ObjectWatcher::Delegate implementation:
   virtual void OnObjectSignaled(HANDLE object);
 
   // We use overlapped reads to ensure that reads from network file systems do
@@ -79,6 +77,8 @@ class URLRequestFileJob : public URLRequestJob,
   bool is_directory_;  // true when the file request is for a direcotry.
   bool is_not_found_;  // true when the file requested does not exist.
 
+  base::ObjectWatcher watcher_;
+
   // This lock ensure that the network_file_thread is not using the loop_ after
   // is has been set to NULL in Kill().
   Lock loop_lock_;