Simplify EncodePageState to return no value.

It was never able to return false, which led to unnecessary error
case handling.  Removing the return value makes reasoning about
invalid PageStates easier.

BUG=568703
TEST=No behavior change.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation

Review-Url: https://codereview.chromium.org/2181753002
Cr-Commit-Position: refs/heads/master@{#407552}

content/browser/frame_host/navigation_entry_impl.cc

@@ -51,8 +51,8 @@ void RecursivelyGenerateFrameEntries(const ExplodedFrameState& state,
   ExplodedPageState page_state;
   page_state.top = state;
   std::string data;
-  if (EncodePageState(page_state, &data))
-    node->frame_entry->set_page_state(PageState::CreateFromEncodedData(data));
+  EncodePageState(page_state, &data);
+  node->frame_entry->set_page_state(PageState::CreateFromEncodedData(data));
 
   for (const ExplodedFrameState& child_state : state.children) {
     NavigationEntryImpl::TreeNode* child_node =
@@ -317,9 +317,7 @@ PageState NavigationEntryImpl::GetPageState() const {
                                 &exploded_state.referenced_files);
 
   std::string encoded_data;
-  if (!EncodePageState(exploded_state, &encoded_data))
-    return frame_tree_->frame_entry->page_state();
-
+  EncodePageState(exploded_state, &encoded_data);
   return PageState::CreateFromEncodedData(encoded_data);
 }
 

content/common/page_state_serialization.cc

@@ -741,12 +741,11 @@ bool DecodePageState(const std::string& encoded, ExplodedPageState* exploded) {
   return !obj.parse_error;
 }
 
-bool EncodePageState(const ExplodedPageState& exploded, std::string* encoded) {
+void EncodePageState(const ExplodedPageState& exploded, std::string* encoded) {
   SerializeObject obj;
   obj.version = kCurrentVersion;
   WritePageState(exploded, &obj);
   *encoded = obj.GetAsString();
-  return true;
 }
 
 #if defined(OS_ANDROID)

content/common/page_state_serialization.h

@@ -71,7 +71,7 @@ struct CONTENT_EXPORT ExplodedPageState {
 
 CONTENT_EXPORT bool DecodePageState(const std::string& encoded,
                                     ExplodedPageState* exploded);
-CONTENT_EXPORT bool EncodePageState(const ExplodedPageState& exploded,
+CONTENT_EXPORT void EncodePageState(const ExplodedPageState& exploded,
                                     std::string* encoded);
 
 #if defined(OS_ANDROID)

content/common/page_state_serialization_unittest.cc

@@ -241,7 +241,7 @@ TEST_F(PageStateSerializationTest, BasicEmpty) {
   ExplodedPageState input;
 
   std::string encoded;
-  EXPECT_TRUE(EncodePageState(input, &encoded));
+  EncodePageState(input, &encoded);
 
   ExplodedPageState output;
   EXPECT_TRUE(DecodePageState(encoded, &output));
@@ -254,7 +254,7 @@ TEST_F(PageStateSerializationTest, BasicFrame) {
   PopulateFrameState(&input.top);
 
   std::string encoded;
-  EXPECT_TRUE(EncodePageState(input, &encoded));
+  EncodePageState(input, &encoded);
 
   ExplodedPageState output;
   EXPECT_TRUE(DecodePageState(encoded, &output));
@@ -268,7 +268,7 @@ TEST_F(PageStateSerializationTest, BasicFramePOST) {
   PopulateHttpBody(&input.top.http_body, &input.referenced_files);
 
   std::string encoded;
-  EXPECT_TRUE(EncodePageState(input, &encoded));
+  EncodePageState(input, &encoded);
 
   ExplodedPageState output;
   EXPECT_TRUE(DecodePageState(encoded, &output));
@@ -288,7 +288,7 @@ TEST_F(PageStateSerializationTest, BasicFrameSet) {
   }
 
   std::string encoded;
-  EXPECT_TRUE(EncodePageState(input, &encoded));
+  EncodePageState(input, &encoded);
 
   ExplodedPageState output;
   EXPECT_TRUE(DecodePageState(encoded, &output));
@@ -371,7 +371,7 @@ TEST_F(PageStateSerializationTest, DumpExpectedPageStateForBackwardsCompat) {
   PopulatePageStateForBackwardsCompatTest(&state);
 
   std::string encoded;
-  EXPECT_TRUE(EncodePageState(state, &encoded));
+  EncodePageState(state, &encoded);
 
   std::string base64;
   base::Base64Encode(encoded, &base64);

content/public/common/page_state.cc

@@ -32,9 +32,7 @@ void ToFilePathVector(const std::vector<base::NullableString16>& input,
 
 PageState ToPageState(const ExplodedPageState& state) {
   std::string encoded_data;
-  if (!EncodePageState(state, &encoded_data))
-    return PageState();
-
+  EncodePageState(state, &encoded_data);
   return PageState::CreateFromEncodedData(encoded_data);
 }
 

content/renderer/history_serialization.cc

@@ -122,9 +122,7 @@ PageState HistoryEntryToPageState(HistoryEntry* entry) {
                                 &state.referenced_files);
 
   std::string encoded_data;
-  if (!EncodePageState(state, &encoded_data))
-    return PageState();
-
+  EncodePageState(state, &encoded_data);
   return PageState::CreateFromEncodedData(encoded_data);
 }
 
@@ -135,9 +133,7 @@ PageState SingleHistoryItemToPageState(const WebHistoryItem& item) {
   GenerateFrameStateFromItem(item, &state.top);
 
   std::string encoded_data;
-  if (!EncodePageState(state, &encoded_data))
-    return PageState();
-
+  EncodePageState(state, &encoded_data);
   return PageState::CreateFromEncodedData(encoded_data);
 }