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

chrome/browser/file_path_watcher/file_path_watcher_browsertest.cc

 // 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.
 
 #include "chrome/browser/file_path_watcher/file_path_watcher.h"
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/stl_util-inl.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_MACOSX)
 // TODO(mnissler): There are flakes on Mac (http://crbug.com/54822) at least for
 // FilePathWatcherTest.MultipleWatchersSingleFile.
 #define MAYBE(name) FLAKY_ ## name
 #else
 #define MAYBE(name) name
 #endif
 
@@ skipping 416 matching lines @@
   SetupWatch(dest_file, &file_watcher, file_delegate.get());
   scoped_refptr<TestDelegate> subdir_delegate(new TestDelegate(collector()));
   SetupWatch(dest_subdir, &subdir_watcher, subdir_delegate.get());
 
   // Move the directory into place, s.t. the watched file appears.
   ASSERT_TRUE(file_util::Move(source_dir, dest_dir));
   WaitForEvents();
 }
 
 }  // namespace