diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 02:42:55 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 02:42:55 +0000 |
| commit | 76bfc7f5d06ab704d404a86866d8358675914545 (patch) | |
| tree | 9881325d5709b9bda157083446418b0c97ee8cf6 /chrome/browser/extensions/activity_log | |
| parent | ccd2b97cc77ec7ff17756c01ec835a83c325375a (diff) | |
| download | chromium_src-76bfc7f5d06ab704d404a86866d8358675914545.zip chromium_src-76bfc7f5d06ab704d404a86866d8358675914545.tar.gz chromium_src-76bfc7f5d06ab704d404a86866d8358675914545.tar.bz2 | |
Fix SessionStorage confusion between RenderViewHostImpl and NavigationController.
Both RenderViewHostImpl and NavigationController had SessionStorageNamespace*,
and under some circumstances, they pointed to different
SessionStorageNamespaces* which is wrong.
This also cleans up some storage partition code, since we're not going to have
multiple SessionStorageNamespaces.
For more information, see bug.
BUG=138152
Review URL: https://chromiumcodereview.appspot.com/18500005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/activity_log')
| -rw-r--r-- | chrome/browser/extensions/activity_log/activity_log_browsertest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/activity_log/activity_log_unittest.cc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/extensions/activity_log/activity_log_browsertest.cc b/chrome/browser/extensions/activity_log/activity_log_browsertest.cc index 481e5cb..6bb158f 100644 --- a/chrome/browser/extensions/activity_log/activity_log_browsertest.cc +++ b/chrome/browser/extensions/activity_log/activity_log_browsertest.cc @@ -91,7 +91,7 @@ IN_PROC_BROWSER_TEST_F(ActivityLogPrerenderTest, TestScriptInjected) { scoped_ptr<prerender::PrerenderHandle> prerender_handle( prerender_manager->AddPrerenderFromLocalPredictor( url, - web_contents->GetController().GetDefaultSessionStorageNamespace(), + web_contents->GetController().GetSessionStorageNamespace(), kSize)); page_observer.Wait(); diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc index e17665c..e9f2c3e 100644 --- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc +++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc @@ -242,7 +242,7 @@ TEST_F(ActivityLogTest, LogPrerender) { scoped_ptr<prerender::PrerenderHandle> prerender_handle( prerender_manager->AddPrerenderFromLocalPredictor( url, - web_contents()->GetController().GetDefaultSessionStorageNamespace(), + web_contents()->GetController().GetSessionStorageNamespace(), kSize)); const std::vector<content::WebContents*> contentses = @@ -264,4 +264,3 @@ TEST_F(ActivityLogTest, LogPrerender) { } } // namespace extensions - |