| commit | 466f5e29eba257623962f12295fa994aac3b81a3 | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Sat Jun 30 02:52:07 2012 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Sat Jun 30 02:52:07 2012 |
| tree | 978e30934ddf8d9038b5cec2306494ed057f22e0 | |
| parent | c5a970ce1208bb4f10ab2bee4c631493d3f78bec [diff] [blame] |
Move the PageAction parts of ExtensionTabHelper::DidNavigateMainFrame to the PageActionController. Test that the page actions are reset on navigation. Review URL: https://chromiumcodereview.appspot.com/10685007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145054 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc index 8fbb699..51543a3 100644 --- a/chrome/browser/extensions/test_extension_system.cc +++ b/chrome/browser/extensions/test_extension_system.cc
@@ -22,7 +22,8 @@ TestExtensionSystem::TestExtensionSystem(Profile* profile) - : profile_(profile) { + : profile_(profile), + info_map_(new ExtensionInfoMap()) { } TestExtensionSystem::~TestExtensionSystem() { @@ -111,7 +112,7 @@ } ExtensionInfoMap* TestExtensionSystem::info_map() { - return NULL; + return info_map_.get(); } extensions::LazyBackgroundTaskQueue*