summaryrefslogtreecommitdiffstats
path: root/chrome/service
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/service
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/service')
-rw-r--r--chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc2
-rw-r--r--chrome/service/gaia/service_gaia_authenticator.h2
-rw-r--r--chrome/service/service_process.h2
-rw-r--r--chrome/service/service_process_unittest.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
index 95ac11b..be3b8aa 100644
--- a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
+++ b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
@@ -6,7 +6,7 @@
#include "base/message_loop_proxy.h"
#include "base/ref_counted.h"
#include "base/threading/thread.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "chrome/common/net/url_request_context_getter.h"
#include "chrome/service/service_process.h"
#include "chrome/service/cloud_print/cloud_print_url_fetcher.h"
diff --git a/chrome/service/gaia/service_gaia_authenticator.h b/chrome/service/gaia/service_gaia_authenticator.h
index ac75619..5d2813a 100644
--- a/chrome/service/gaia/service_gaia_authenticator.h
+++ b/chrome/service/gaia/service_gaia_authenticator.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/ref_counted.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "chrome/common/net/url_fetcher.h"
#include "chrome/common/net/gaia/gaia_authenticator.h"
diff --git a/chrome/service/service_process.h b/chrome/service/service_process.h
index e1674dc..ee1727f 100644
--- a/chrome/service/service_process.h
+++ b/chrome/service/service_process.h
@@ -12,7 +12,7 @@
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
#include "base/threading/thread.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "chrome/service/cloud_print/cloud_print_proxy.h"
#include "chrome/service/remoting/chromoting_host_manager.h"
diff --git a/chrome/service/service_process_unittest.cc b/chrome/service/service_process_unittest.cc
index 7b8fff1..cfc6fc0 100644
--- a/chrome/service/service_process_unittest.cc
+++ b/chrome/service/service_process_unittest.cc
@@ -8,7 +8,7 @@
#include "base/command_line.h"
#include "base/crypto/rsa_private_key.h"
#include "base/message_loop.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "chrome/service/service_process.h"
#include "remoting/host/host_key_pair.h"
#include "testing/gmock/include/gmock/gmock.h"