Merge Chromium at r63472 : Initial merge by git.

Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a

1 files changed, 3 insertions, 3 deletions

diff --git a/chrome/browser/file_path_watcher.h b/chrome/browser/file_path_watcher.h
index b8c857f..da123c6 100644
--- a/chrome/browser/file_path_watcher.h
+++ b/chrome/browser/file_path_watcher.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/ref_counted.h"
-#include "chrome/browser/chrome_thread.h"
+#include "chrome/browser/browser_thread.h"
 
 // This class lets you register interest in changes on a FilePath.
 // The delegate will get called whenever the file or directory referenced by the
@@ -40,7 +40,7 @@ class FilePathWatcher {
   // Register interest in any changes on |path|. OnPathChanged will be called
   // back for each change. Returns true on success.
   bool Watch(const FilePath& path, Delegate* delegate) WARN_UNUSED_RESULT {
-    DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
     DCHECK(path.IsAbsolute());
     return impl_->Watch(path, delegate);
   }
@@ -48,7 +48,7 @@ class FilePathWatcher {
   // Used internally to encapsulate different members on different platforms.
   class PlatformDelegate
       : public base::RefCountedThreadSafe<PlatformDelegate,
-                                          ChromeThread::DeleteOnFileThread> {
+                                          BrowserThread::DeleteOnFileThread> {
    public:
     virtual ~PlatformDelegate() {}