Add Reload and LoadData methods to WebFrame.

webkit/tools/test_shell/test_shell.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 "V8Proxy.h"
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
@@ skipping 508 matching lines @@
   // A navigation resulting from loading a javascript URL should not be
   // treated as a browser initiated event.  Instead, we want it to look as if
   // the page initiated any load resulting from JS execution.
   if (!entry.GetURL().SchemeIs("javascript")) {
     delegate_->set_pending_extra_data(
         new TestShellExtraData(entry.GetPageID()));
   }
 
   // If we are reloading, then WebKit will use the state of the current page.
   // Otherwise, we give it the state to navigate to.
-  if (!reload && !entry.GetContentState().empty()) {
+  if (reload) {
+    frame->Reload();
+  } else if (!entry.GetContentState().empty()) {
     DCHECK(entry.GetPageID() != -1);
     frame->LoadHistoryItem(
         webkit_glue::HistoryItemFromString(entry.GetContentState()));
   } else {
-    WebURLRequest::CachePolicy cache_policy;
-    if (reload) {
-      cache_policy = WebURLRequest::ReloadIgnoringCacheData;
-    } else {
-      DCHECK(entry.GetPageID() == -1);
-      cache_policy = WebURLRequest::UseProtocolCachePolicy;
-    }
-
-    WebURLRequest request(entry.GetURL());
-    request.setCachePolicy(cache_policy);
-
-    frame->LoadRequest(request);
+    DCHECK(entry.GetPageID() == -1);
+    frame->LoadRequest(WebURLRequest(entry.GetURL()));
   }
 
   // In case LoadRequest failed before DidCreateDataSource was called.
   delegate_->set_pending_extra_data(NULL);
 
   // Restore focus to the main frame prior to loading new request.
   // This makes sure that we don't have a focused iframe. Otherwise, that
   // iframe would keep focus when the SetFocus called immediately after
   // LoadRequest, thus making some tests fail (see http://b/issue?id=845337
   // for more details).
@@ skipping 113 matching lines @@
   }
 #endif  // OS_WIN
   return false;
 }
 
 std::wstring GetWebKitLocale() {
   return L"en-US";
 }
 
 }  // namespace webkit_glue