base/thread.h moved to base/threading/thread.h:
http://codereview.chromium.org/
6028009
base/condition_variable.h base/lock.h moved to base/synchronization
and classes added to base namespace:
http://codereview.chromium.org/
6018013
Change-Id: I74d14224d6b17df33bc1cc9a5521fd267f4e830c
#include <android/net/android_network_library_impl.h>
#include <base/callback.h>
-#include <base/condition_variable.h>
#include <base/lock.h>
#include <base/message_loop_proxy.h>
#include <base/ref_counted.h>
#include <base/string_util.h>
+#include <base/synchronization/condition_variable.h>
#include <base/sys_string_conversions.h>
-#include <base/thread.h>
+#include <base/threading/thread.h>
#include <base/time.h>
#include <base/tuple.h>
#include <chrome/browser/net/sqlite_persistent_cookie_store.h>
m_condition.Broadcast();
}
- Lock m_lock;
- ConditionVariable m_condition;
+ base::Lock m_lock;
+ base::ConditionVariable m_condition;
volatile int m_count;
};
return networkThread;
}
-Lock* WebUrlLoaderClient::syncLock() {
+base::Lock* WebUrlLoaderClient::syncLock() {
static Lock s_syncLock;
return &s_syncLock;
}
-ConditionVariable* WebUrlLoaderClient::syncCondition() {
- static ConditionVariable s_syncCondition(syncLock());
+base::ConditionVariable* WebUrlLoaderClient::syncCondition() {
+ static base::ConditionVariable s_syncCondition(syncLock());
return &s_syncCondition;
}
#include <string>
#include <vector>
-class Lock;
-class ConditionVariable;
namespace base {
+class ConditionVariable;
+class Lock;
class Thread;
}
// Mutex and condition variable used for synchronous requests.
// Note that these are static. This works because there's only one main thread.
- static Lock* syncLock();
- static ConditionVariable* syncCondition();
+ static base::Lock* syncLock();
+ static base::ConditionVariable* syncCondition();
// Queue of callbacks to be executed by the main thread. Must only be accessed inside mutex.
std::deque<Task*> m_queue;