| Index: chrome/browser/extensions/extension_service_test_base.h
|
| diff --git a/chrome/browser/extensions/extension_service_test_base.h b/chrome/browser/extensions/extension_service_test_base.h
|
| index 0a4e818e1e8e477f0af585913e4900be06a18b08..d64322d936a5b6b16aceee88b1760bd1caf118e2 100644
|
| --- a/chrome/browser/extensions/extension_service_test_base.h
|
| +++ b/chrome/browser/extensions/extension_service_test_base.h
|
| @@ -85,6 +85,9 @@ class ExtensionServiceTestBase : public testing::Test {
|
| // Initialize an ExtensionService with autoupdate enabled.
|
| void InitializeExtensionServiceWithUpdater();
|
|
|
| + // Resets the browser thread bundle to one with |options|.
|
| + void ResetThreadBundle(int options);
|
| +
|
| // TODO(rdevlin.cronin): Pull out more methods from ExtensionServiceTest that
|
| // are commonly used and/or reimplemented. For instance, methods to install
|
| // extensions from various locations, etc.
|
| @@ -120,7 +123,10 @@ class ExtensionServiceTestBase : public testing::Test {
|
| // Destroying at_exit_manager_ will delete all LazyInstances, so it must come
|
| // after thread_bundle_ in the destruction order.
|
| base::ShadowingAtExitManager at_exit_manager_;
|
| - content::TestBrowserThreadBundle thread_bundle_;
|
| + scoped_ptr<content::TestBrowserThreadBundle> thread_bundle_;
|
| +
|
| + // Whether or not the thread bundle was reset in the test.
|
| + bool did_reset_thread_bundle_;
|
|
|
| // The directory into which extensions are installed.
|
| base::FilePath extensions_install_dir_;
|
|
|