Move CancellationFlag and WaitableEvent to the synchronization subdirectory....

chrome/browser/cancelable_request.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // CancelableRequestProviders and Consumers work together to make requests that
 // execute on a background thread in the provider and return data to the
 // consumer. These class collaborate to keep a list of open requests and to
 // make sure that requests to not outlive either of the objects involved in the
 // transaction.
 //
@@ skipping 74 matching lines @@
 
 #ifndef CHROME_BROWSER_CANCELABLE_REQUEST_H__
 #define CHROME_BROWSER_CANCELABLE_REQUEST_H__
 #pragma once
 
 #include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "base/cancellation_flag.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "base/synchronization/cancellation_flag.h"
 #include "base/task.h"
 #include "build/build_config.h"
 
 class CancelableRequestBase;
 class CancelableRequestConsumerBase;
 
 // CancelableRequestProvider --------------------------------------------------
 //
 // This class is threadsafe. Requests may be added or canceled from any thread,
 // but a task must only be canceled from the same thread it was initially run
@@ skipping 30 matching lines @@
 
  private:
   typedef std::map<Handle, scoped_refptr<CancelableRequestBase> >
       CancelableRequestMap;
 
   // Only call this when you already have acquired pending_request_lock_.
   void CancelRequestLocked(const CancelableRequestMap::iterator& item);
 
   friend class CancelableRequestBase;
 
-  Lock pending_request_lock_;
+  base::Lock pending_request_lock_;
 
   // Lists all outstanding requests. Protected by the |lock_|.
   CancelableRequestMap pending_requests_;
 
   // The next handle value we will return. Protected by the |lock_|.
   int next_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(CancelableRequestProvider);
 };
 
@@ skipping 533 matching lines @@
   }
 
   // The value.
   Type value;
 
  protected:
   virtual ~CancelableRequest1() {}
 };
 
 #endif  // CHROME_BROWSER_CANCELABLE_REQUEST_H__