Revert of Remove dependency on content from remoting_host.

remoting/host/chromeos/clipboard_aura_unittest.cc

 // Copyright 2014 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 "remoting/host/chromeos/clipboard_aura.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 37 matching lines @@
 class ClipboardAuraTest : public testing::Test {
  public:
   ClipboardAuraTest() {}
   void SetUp() override;
   void TearDown() override;
 
  protected:
   void StopAndResetClipboard();
 
   base::MessageLoopForUI message_loop_;
+  base::RunLoop run_loop_;
   ClientClipboard* client_clipboard_;
   scoped_ptr<ClipboardAura> clipboard_;
 };
 
 void ClipboardAuraTest::SetUp() {
   // Alert the clipboard class to which threads are allowed to access the
   // clipboard.
   std::vector<base::PlatformThreadId> allowed_clipboard_threads;
   allowed_clipboard_threads.push_back(base::PlatformThread::CurrentId());
   ui::Clipboard::SetAllowedThreads(allowed_clipboard_threads);
 
   // Setup the clipboard.
   scoped_refptr<base::SingleThreadTaskRunner> task_runner =
       message_loop_.message_loop_proxy();
   client_clipboard_ = new ClientClipboard();
-  clipboard_.reset(new ClipboardAura());
+  clipboard_.reset(new ClipboardAura(task_runner));
+  clipboard_->Start(make_scoped_ptr(client_clipboard_));
 
   EXPECT_GT(TestTimeouts::tiny_timeout(), kTestOverridePollingInterval * 10)
       << "The test timeout should be greater than the polling interval";
   clipboard_->SetPollingIntervalForTesting(kTestOverridePollingInterval);
-
-  clipboard_->Start(make_scoped_ptr(client_clipboard_));
 }
 
 void ClipboardAuraTest::TearDown() {
   ui::Clipboard::DestroyClipboardForCurrentThread();
 }
 
 void ClipboardAuraTest::StopAndResetClipboard() {
   clipboard_->Stop();
   clipboard_.reset();
 }
 
 TEST_F(ClipboardAuraTest, WriteToClipboard) {
   protocol::ClipboardEvent event;
   event.set_mime_type(kMimeTypeTextUtf8);
   event.set_data("Test data.");
 
   clipboard_->InjectClipboardEvent(event);
   StopAndResetClipboard();
-  base::RunLoop().RunUntilIdle();
+  run_loop_.RunUntilIdle();
 
   std::string clipboard_data;
   ui::Clipboard* aura_clipboard = ui::Clipboard::GetForCurrentThread();
   aura_clipboard->ReadAsciiText(ui::CLIPBOARD_TYPE_COPY_PASTE, &clipboard_data);
 
   EXPECT_EQ(clipboard_data, "Test data.")
       << "InjectClipboardEvent should write to aura clipboard";
 }
 
 TEST_F(ClipboardAuraTest, MonitorClipboardChanges) {
-  base::RunLoop().RunUntilIdle();
-
   {
     // |clipboard_writer| will write to the clipboard when it goes out of scope.
     ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_COPY_PASTE);
     clipboard_writer.WriteText(base::UTF8ToUTF16("Test data."));
   }
 
   EXPECT_CALL(*client_clipboard_,
               InjectClipboardEvent(Property(&protocol::ClipboardEvent::data,
                                             Eq("Test data.")))).Times(1);
 
-  base::RunLoop run_loop;
   message_loop_.PostDelayedTask(
       FROM_HERE, base::Bind(&ClipboardAuraTest_MonitorClipboardChanges_Test::
                                 StopAndResetClipboard,
                             base::Unretained(this)),
       TestTimeouts::tiny_timeout());
-  message_loop_.PostDelayedTask(FROM_HERE, run_loop.QuitClosure(),
+  message_loop_.PostDelayedTask(FROM_HERE, base::MessageLoop::QuitClosure(),
                                 TestTimeouts::tiny_timeout());
-  run_loop.Run();
+  message_loop_.Run();
 }
 
 }  // namespace remoting