summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-02 06:05:39 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-02 06:05:39 +0000
commit44f9c950c66c18b205f1dd56a793693899b5057a (patch)
tree4d742f4838732d42bd7f536f8440df7aa0bbbcbf /chrome/test/automation
parentf2bcc90abc6c33292592b17351973600b51e9b62 (diff)
downloadchromium_src-44f9c950c66c18b205f1dd56a793693899b5057a.zip
chromium_src-44f9c950c66c18b205f1dd56a793693899b5057a.tar.gz
chromium_src-44f9c950c66c18b205f1dd56a793693899b5057a.tar.bz2
Move CancellationFlag and WaitableEvent to the synchronization subdirectory.
TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/5977010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
-rw-r--r--chrome/test/automation/automation_proxy.cc2
-rw-r--r--chrome/test/automation/automation_proxy.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
index 1138cc4..18ddc3e 100644
--- a/chrome/test/automation/automation_proxy.cc
+++ b/chrome/test/automation/automation_proxy.cc
@@ -13,7 +13,7 @@
#include "base/threading/platform_thread.h"
#include "base/process_util.h"
#include "base/ref_counted.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "chrome/common/automation_constants.h"
#include "chrome/common/automation_messages.h"
#include "chrome/common/chrome_version_info.h"
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h
index 1852c49..d1dcf19 100644
--- a/chrome/test/automation/automation_proxy.h
+++ b/chrome/test/automation/automation_proxy.h
@@ -17,7 +17,7 @@
#include "base/scoped_ptr.h"
#include "base/time.h"
#include "base/threading/thread.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/automation_constants.h"
#include "chrome/test/automation/automation_handle_tracker.h"