Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4600)

Unified Diff: chrome/browser/extensions/extension_service_unittest.h

Issue 13533007: Test extension reloading behavior. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_service_unittest.h
diff --git a/chrome/browser/extensions/extension_service_unittest.h b/chrome/browser/extensions/extension_service_unittest.h
index 6f46f77896f4fefe416f6ccdfbfe32bde00f6598..f950534d8b0a605a77d9c35f679c0b31cb978fe0 100644
--- a/chrome/browser/extensions/extension_service_unittest.h
+++ b/chrome/browser/extensions/extension_service_unittest.h
@@ -15,6 +15,7 @@
#include "chrome/common/extensions/extension_unittest.h"
#include "chrome/common/extensions/feature_switch.h"
#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_renderer_host.h"
#include "testing/gtest/include/gtest/gtest.h"
class TestingProfile;
@@ -25,7 +26,8 @@ class ManagementPolicy;
class ExtensionServiceTestBase : public extensions::ExtensionTest {
public:
- ExtensionServiceTestBase();
+ ExtensionServiceTestBase(
+ MessageLoop::Type main_loop_type = MessageLoop::TYPE_UI);
virtual ~ExtensionServiceTestBase();
void InitializeExtensionService(const base::FilePath& profile_path,
@@ -59,6 +61,7 @@ class ExtensionServiceTestBase : public extensions::ExtensionTest {
MessageLoop loop_;
base::ShadowingAtExitManager at_exit_manager_;
base::ScopedTempDir temp_dir_;
+ content::RenderViewHostTestEnabler rvh_enabler_;
scoped_ptr<TestingProfile> profile_;
base::FilePath extensions_install_dir_;
base::FilePath data_dir_;
@@ -71,7 +74,7 @@ class ExtensionServiceTestBase : public extensions::ExtensionTest {
content::TestBrowserThread webkit_thread_;
content::TestBrowserThread file_thread_;
content::TestBrowserThread file_user_blocking_thread_;
- content::TestBrowserThread io_thread_;
+ scoped_ptr<content::TestBrowserThread> io_thread_;
extensions::FeatureSwitch::ScopedOverride override_sideload_wipeout_;
};

Powered by Google App Engine
This is Rietveld 408576698