Support base::test::ScopedTaskEnvironment and content::TestBrowserThreadBundle in the same scope.

content/public/test/test_browser_thread_bundle.h

Index: content/public/test/test_browser_thread_bundle.h
diff --git a/content/public/test/test_browser_thread_bundle.h b/content/public/test/test_browser_thread_bundle.h
index 15cdba8f5c6b350876bfb172fe04a15de5dac492..2bd3ed5afed91576641ad9eaeb43584f9809ff22 100644
--- a/content/public/test/test_browser_thread_bundle.h
+++ b/content/public/test/test_browser_thread_bundle.h
@@ -53,6 +53,14 @@
 //
 // DONT_CREATE_THREADS should only be used when the options specify at least
 // one real thread other than the main thread.
+//
+// TestBrowserThreadBundle may be instantiated in a scope where there is already
+// a ScopedTaskEnvironment. In that case, it will use the MessageLoop and the

[gab, 2017/05/03 17:44:41]

base::test::ScopedTaskEnvironment

[fdoray, 2017/05/03 17:59:57]

Done.

+// TaskScheduler provided by this ScopedTaskEnvironment instead of creating its
+// own. The ability to have a ScopedTaskEnvironment and a
+// TestBrowserThreadBundle in the same scope is useful when a fixture that
+// inherits from a fixture that provides a ScopedTaskEnvironment needs to add
+// support for browser threads.
 
 #ifndef CONTENT_PUBLIC_TEST_TEST_BROWSER_THREAD_BUNDLE_H_
 #define CONTENT_PUBLIC_TEST_TEST_BROWSER_THREAD_BUNDLE_H_