Chrome side of webkit merge to r40164....

webkit/glue/glue_serialize_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include <string>
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
@@ skipping 73 matching lines @@
     item->setURLString("urlString");
     item->setOriginalURLString("originalURLString");
     item->setTarget("target");
     item->setParent("parent");
     item->setTitle("title");
     item->setAlternateTitle("alternateTitle");
     item->setLastVisitedTime(13.37);
     item->setScrollPoint(IntPoint(42, -42));
     item->setIsTargetItem(true);
     item->setVisitCount(42*42);
-    item->setRSSFeedReferrer("rssFeedReferrer");
 
     Vector<String> document_state;
     document_state.append("state1");
     document_state.append("state2");
     document_state.append("state AWESOME");
     item->setDocumentState(document_state);
 
     // Form Data
     ResourceRequest dummy_request;  // only way to initialize HistoryItem
     if (with_form_data) {
       dummy_request.setHTTPBody(MakeFormData());
       dummy_request.setHTTPContentType("formContentType");
-      dummy_request.setHTTPReferrer("formReferrer");
+      dummy_request.setHTTPReferrer("referrer");
       dummy_request.setHTTPMethod("POST");
     }
     item->setFormInfoFromRequest(dummy_request);
 
+    // Setting the FormInfo causes the referrer to be set, so we set the
+    // referrer after setting the form info.
+    item->setReferrer("referrer");
+
     // Children
     if (pregnant)
       item->addChildItem(MakeHistoryItem(false, false));
 
     return item.release();
   }
 
   // Checks that a == b.
   void HistoryItemExpectEqual(HistoryItem* a, HistoryItem* b) {
     EXPECT_EQ(a->urlString(), b->urlString());
     EXPECT_EQ(a->originalURLString(), b->originalURLString());
     EXPECT_EQ(a->target(), b->target());
     EXPECT_EQ(a->parent(), b->parent());
     EXPECT_EQ(a->title(), b->title());
     EXPECT_EQ(a->alternateTitle(), b->alternateTitle());
     EXPECT_EQ(a->lastVisitedTime(), b->lastVisitedTime());
     EXPECT_EQ(a->scrollPoint(), b->scrollPoint());
     EXPECT_EQ(a->isTargetItem(), b->isTargetItem());
     EXPECT_EQ(a->visitCount(), b->visitCount());
-    EXPECT_EQ(a->rssFeedReferrer(), b->rssFeedReferrer());
+    EXPECT_EQ(a->referrer(), b->referrer());
     EXPECT_EQ(a->documentState(), b->documentState());
 
     // Form Data
     EXPECT_EQ(a->formData() != NULL, b->formData() != NULL);
     if (a->formData() && b->formData())
       EXPECT_EQ(*a->formData(), *b->formData());
-    EXPECT_EQ(a->formReferrer(), b->formReferrer());
     EXPECT_EQ(a->formContentType(), b->formContentType());
 
     // Children
     EXPECT_EQ(a->children().size(), b->children().size());
     for (size_t i = 0, c = a->children().size(); i < c; ++i) {
       HistoryItemExpectEqual(a->children().at(i).get(),
                              b->children().at(i).get());
     }
   }
 };
@@ skipping 22 matching lines @@
   HistoryItemToString(item, &serialized_item);
   RefPtr<HistoryItem> deserialized_item = HistoryItemFromString(serialized_item);
 
   ASSERT_FALSE(item == NULL);
   ASSERT_FALSE(deserialized_item == NULL);
   HistoryItemExpectEqual(item.get(), deserialized_item.get());
 }
 
 
 } // namespace