Revert of Remote assistance on Chrome OS Part IV - It2MeHost

remoting/host/policy_hack/policy_watcher_unittest.cc

 // Copyright (c) 2012 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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "remoting/host/dns_blackhole_checker.h"
@@ skipping 81 matching lines @@
 #endif
   }
 
  protected:
   void StartWatching() {
     policy_watcher_->StartWatching(policy_callback_);
     base::RunLoop().RunUntilIdle();
   }
 
   void StopWatching() {
-    EXPECT_CALL(*this, PostPolicyWatcherShutdown()).Times(1);
-    policy_watcher_->StopWatching(base::Bind(
-        &PolicyWatcherTest::PostPolicyWatcherShutdown, base::Unretained(this)));
+    base::WaitableEvent stop_event(false, false);
+    policy_watcher_->StopWatching(&stop_event);
     base::RunLoop().RunUntilIdle();
+    EXPECT_EQ(true, stop_event.IsSignaled());
   }
 
-  MOCK_METHOD0(PostPolicyWatcherShutdown, void());
-
   static const char* kHostDomain;
   static const char* kPortRange;
   base::MessageLoop message_loop_;
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
   MockPolicyCallback mock_policy_callback_;
   PolicyWatcher::PolicyCallback policy_callback_;
   scoped_ptr<FakePolicyWatcher> policy_watcher_;
   base::DictionaryValue empty_;
   base::DictionaryValue nat_true_;
   base::DictionaryValue nat_false_;
@@ skipping 279 matching lines @@
 
   StartWatching();
   policy_watcher_->SetPolicies(&empty_);
   policy_watcher_->SetPolicies(&port_range_full_);
   policy_watcher_->SetPolicies(&port_range_empty_);
   StopWatching();
 }
 
 }  // namespace policy_hack
 }  // namespace remoting