summaryrefslogtreecommitdiffstats
path: root/components/sessions/serialized_navigation_entry_test_helper.h
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-26 02:02:18 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-26 02:02:18 +0000
commite0185f9fe7ba991f701ac7bb6d8dbafa745a31ab (patch)
treed43a5f87c837ba410e30e0d9095f1cd3e1a9c95c /components/sessions/serialized_navigation_entry_test_helper.h
parentd70d82db35eecb586629a05bffc580282c0c30b4 (diff)
downloadchromium_src-e0185f9fe7ba991f701ac7bb6d8dbafa745a31ab.zip
chromium_src-e0185f9fe7ba991f701ac7bb6d8dbafa745a31ab.tar.gz
chromium_src-e0185f9fe7ba991f701ac7bb6d8dbafa745a31ab.tar.bz2
Revert 202188 "Introduce content::PageState."
This change bloated npchrome_frame.dll (see http://build.chromium.org/f/chromium/perf/xp-release/sizes/report.html?=undefined&history=3&rev=202214&graph=npchrome_frame.dll) because content_common.lib's common_param_traits.obj depends on content_common.lib's page_state.obj which, in turn, depends on webkit. This means that consumers of IPC messages in content_common suddenly require all of webkit. > Introduce content::PageState. > > This is a concrete class wrapping a string that contains the > data of a serialized WebKit::WebHistoryItem class. Previously, > we've just passed around these as strings, giving them names > like "state", "content_state" or "history_state". It has been > hard to identify all of the places in the code where these > strings get passed around. A concrete class should make usage > more apparent. Plus, instead of manipulating the strings using > methods from webkit/glue/glue_serialize.h, we can just declare > methods on the PageState class. This makes the code much cleaner. > > This first pass just implements PageState in terms of glue_serialize. > It also adds content/public/renderer/history_item_serialization.h > as the home for PageState to WebKit::WebHistoryItem conversion, > which should ideally only be usable from the renderer process. > (This bit is a step toward resolving bug 237243.) > > page_state.h declares operator==() to support DCHECK_EQ, which > seems consistent with the idea of PageState being a replacement > for std::string. I didn't want to litter tests with calls to > PageState::ToEncodedData(). That would get cumbersome. > > BUG=240426 > R=brettw@chromium.org, tsepez@chromium.org > > Review URL: https://codereview.chromium.org/14985014 TBR=darin@chromium.org Review URL: https://codereview.chromium.org/16068002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/sessions/serialized_navigation_entry_test_helper.h')
-rw-r--r--components/sessions/serialized_navigation_entry_test_helper.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/components/sessions/serialized_navigation_entry_test_helper.h b/components/sessions/serialized_navigation_entry_test_helper.h
index a653f22..43b49eb 100644
--- a/components/sessions/serialized_navigation_entry_test_helper.h
+++ b/components/sessions/serialized_navigation_entry_test_helper.h
@@ -17,7 +17,6 @@ class Time;
}
namespace content {
-class PageState;
struct Referrer;
}
@@ -39,8 +38,8 @@ class SerializedNavigationEntryTestHelper {
const std::string& virtual_url,
const std::string& title);
- static void SetPageState(const content::PageState& page_state,
- SerializedNavigationEntry* navigation);
+ static void SetContentState(const std::string& content_state,
+ SerializedNavigationEntry* navigation);
static void SetHasPostData(bool has_post_data,
SerializedNavigationEntry* navigation);