Rename request() method to getRequest().

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 4157 matching lines @@
   WebURLRequest request(toKURL(m_baseURL + "fixed_layout.html"));
   webViewHelper.webView()->mainFrame()->loadRequest(request);
   // start reload before first request is delivered.
   FrameTestHelpers::reloadFrameBypassingCache(
       webViewHelper.webView()->mainFrame());
 
   WebDataSource* dataSource =
       webViewHelper.webView()->mainFrame()->dataSource();
   ASSERT_TRUE(dataSource);
   EXPECT_EQ(toKURL(m_baseURL + "fixed_layout.html"),
-            KURL(dataSource->request().url()));
+            KURL(dataSource->getRequest().url()));
 }
 
 TEST_P(ParameterizedWebFrameTest, AppendRedirects) {
   const std::string firstURL = "about:blank";
   const std::string secondURL = "http://internal.test";
 
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(firstURL, true);
 
   WebDataSource* dataSource =
@@ skipping 2804 matching lines @@
   FrameTestHelpers::loadFrame(frame, m_baseURL + "white-1x1.png");
   EXPECT_NE(firstItem.get(), mainFrameLoader.currentItem());
 
   FrameTestHelpers::loadHistoryItem(frame, WebHistoryItem(firstItem.get()),
                                     WebHistoryDifferentDocumentLoad,
                                     WebCachePolicy::UseProtocolCachePolicy);
   EXPECT_EQ(firstItem.get(), mainFrameLoader.currentItem());
 
   FrameTestHelpers::reloadFrame(frame);
   EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
-            frame->dataSource()->request().getCachePolicy());
+            frame->dataSource()->getRequest().getCachePolicy());
 }
 
 TEST_P(ParameterizedWebFrameTest, BackDuringChildFrameReload) {
   registerMockedHttpURLLoad("page_with_blank_iframe.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "page_with_blank_iframe.html",
                                   true);
   WebLocalFrame* mainFrame = webViewHelper.webView()->mainFrameImpl();
   const FrameLoader& mainFrameLoader =
       webViewHelper.webView()->mainFrameImpl()->frame()->loader();
@@ skipping 26 matching lines @@
   webViewHelper.initializeAndLoad(m_baseURL + "reload_post.html", true);
   WebFrame* frame = webViewHelper.webView()->mainFrame();
 
   FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(),
                               "javascript:document.forms[0].submit()");
   // Pump requests one more time after the javascript URL has executed to
   // trigger the actual POST load request.
   FrameTestHelpers::pumpPendingRequestsForFrameToLoad(
       webViewHelper.webView()->mainFrame());
   EXPECT_EQ(WebString::fromUTF8("POST"),
-            frame->dataSource()->request().httpMethod());
+            frame->dataSource()->getRequest().httpMethod());
 
   FrameTestHelpers::reloadFrame(frame);
   EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
-            frame->dataSource()->request().getCachePolicy());
+            frame->dataSource()->getRequest().getCachePolicy());
   EXPECT_EQ(WebNavigationTypeFormResubmitted,
             frame->dataSource()->navigationType());
 }
 
 TEST_P(ParameterizedWebFrameTest, LoadHistoryItemReload) {
   registerMockedHttpURLLoad("fragment_middle_click.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "fragment_middle_click.html",
                                   true);
   WebFrame* frame = webViewHelper.webView()->mainFrame();
   const FrameLoader& mainFrameLoader =
       webViewHelper.webView()->mainFrameImpl()->frame()->loader();
   Persistent<HistoryItem> firstItem = mainFrameLoader.currentItem();
   EXPECT_TRUE(firstItem);
 
   registerMockedHttpURLLoad("white-1x1.png");
   FrameTestHelpers::loadFrame(frame, m_baseURL + "white-1x1.png");
   EXPECT_NE(firstItem.get(), mainFrameLoader.currentItem());
 
   // Cache policy overrides should take.
   FrameTestHelpers::loadHistoryItem(frame, WebHistoryItem(firstItem),
                                     WebHistoryDifferentDocumentLoad,
                                     WebCachePolicy::ValidatingCacheData);
   EXPECT_EQ(firstItem.get(), mainFrameLoader.currentItem());
   EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
-            frame->dataSource()->request().getCachePolicy());
+            frame->dataSource()->getRequest().getCachePolicy());
 }
 
 class TestCachePolicyWebFrameClient
     : public FrameTestHelpers::TestWebFrameClient {
  public:
   explicit TestCachePolicyWebFrameClient(
       TestCachePolicyWebFrameClient* parentClient)
       : m_parentClient(parentClient),
         m_policy(WebCachePolicy::UseProtocolCachePolicy),
         m_childClient(0),
@@ skipping 1241 matching lines @@
 
 TEST_P(ParameterizedWebFrameTest, ReloadBypassingCache) {
   // Check that a reload bypassing cache on a frame will result in the cache
   // policy of the request being set to ReloadBypassingCache.
   registerMockedHttpURLLoad("foo.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "foo.html", true);
   WebFrame* frame = webViewHelper.webView()->mainFrame();
   FrameTestHelpers::reloadFrameBypassingCache(frame);
   EXPECT_EQ(WebCachePolicy::BypassingCache,
-            frame->dataSource()->request().getCachePolicy());
+            frame->dataSource()->getRequest().getCachePolicy());
 }
 
 static void nodeImageTestValidation(const IntSize& referenceBitmapSize,
                                     DragImage* dragImage) {
   // Prepare the reference bitmap.
   SkBitmap bitmap;
   bitmap.allocN32Pixels(referenceBitmapSize.width(),
                         referenceBitmapSize.height());
   SkCanvas canvas(bitmap);
   canvas.drawColor(SK_ColorGREEN);
@@ skipping 2742 matching lines @@
 
   EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents());
 
   webViewHelper.reset();
 }
 
 }  // namespace blink