[iOS] ios/web no longer depends on content::BrowserThread.

ios/web/test/test_web_thread_bundle.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 "ios/web/public/test/test_web_thread_bundle.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "ios/web/public/test/test_web_thread.h"
 #include "ios/web/web_thread_impl.h"
 
 namespace web {
 
-// Implmentation of TestWebThreadBundle using TestWebThreads.
-// TODO(stuartmorgan): The only reason this is a separate impl class is to
-// keep the implementation details out of the header so that it can be shared
-// with the adapter implementation that uses TestBrowserThreadBundle. Once that
-// version is gone, fold this into TestWebThreadBundle.
-class TestWebThreadBundleImpl {
- public:
-  explicit TestWebThreadBundleImpl();
-  explicit TestWebThreadBundleImpl(int options);
-
-  ~TestWebThreadBundleImpl();
-
- private:
-  void Init(int options);
-
-  scoped_ptr<base::MessageLoop> message_loop_;
-  scoped_ptr<TestWebThread> ui_thread_;
-  scoped_ptr<TestWebThread> db_thread_;
-  scoped_ptr<TestWebThread> file_thread_;
-  scoped_ptr<TestWebThread> file_user_blocking_thread_;
-  scoped_ptr<TestWebThread> cache_thread_;
-  scoped_ptr<TestWebThread> io_thread_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestWebThreadBundleImpl);
-};
-
-TestWebThreadBundleImpl::TestWebThreadBundleImpl() {
+TestWebThreadBundle::TestWebThreadBundle() {
   Init(TestWebThreadBundle::DEFAULT);
 }
 
-TestWebThreadBundleImpl::TestWebThreadBundleImpl(int options) {
+TestWebThreadBundle::TestWebThreadBundle(int options) {
   Init(options);
 }
 
-TestWebThreadBundleImpl::~TestWebThreadBundleImpl() {
+TestWebThreadBundle::~TestWebThreadBundle() {
   // To avoid memory leaks, ensure that any tasks posted to the blocking pool
   // via PostTaskAndReply are able to reply back to the originating thread, by
   // flushing the blocking pool while the browser threads still exist.
   base::RunLoop().RunUntilIdle();
   WebThreadImpl::FlushThreadPoolHelperForTesting();
 
   // To ensure a clean teardown, each thread's message loop must be flushed
   // just before the thread is destroyed. But destroying a fake thread does not
   // automatically flush the message loop, so do it manually.
   // See http://crbug.com/247525 for discussion.
@@ skipping 10 matching lines @@
   base::RunLoop().RunUntilIdle();
   // This is the point at which the thread pool is normally shut down. So flush
   // it again in case any shutdown tasks have been posted to the pool from the
   // threads above.
   WebThreadImpl::FlushThreadPoolHelperForTesting();
   base::RunLoop().RunUntilIdle();
   ui_thread_.reset();
   base::RunLoop().RunUntilIdle();
 }
 
-void TestWebThreadBundleImpl::Init(int options) {
+void TestWebThreadBundle::Init(int options) {
   if (options & TestWebThreadBundle::IO_MAINLOOP) {
     message_loop_.reset(new base::MessageLoopForIO());
   } else {
     message_loop_.reset(new base::MessageLoopForUI());
   }
 
   ui_thread_.reset(new TestWebThread(WebThread::UI, message_loop_.get()));
 
   if (options & TestWebThreadBundle::REAL_DB_THREAD) {
     db_thread_.reset(new TestWebThread(WebThread::DB));
@@ skipping 27 matching lines @@
   }
 
   if (options & TestWebThreadBundle::REAL_IO_THREAD) {
     io_thread_.reset(new TestWebThread(WebThread::IO));
     io_thread_->StartIOThread();
   } else {
     io_thread_.reset(new TestWebThread(WebThread::IO, message_loop_.get()));
   }
 }
 
-#pragma mark - TestWebThreadBundle
-
-TestWebThreadBundle::TestWebThreadBundle()
-    : impl_(new TestWebThreadBundleImpl()) {
-}
-
-TestWebThreadBundle::TestWebThreadBundle(int options)
-    : impl_(new TestWebThreadBundleImpl(options)) {
-}
-
-TestWebThreadBundle::~TestWebThreadBundle() {
-}
-
 }  // namespace web