Switch to WebFrame from the WebKit API....

webkit/glue/dom_serializer_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 "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "Document.h"
@@ skipping 18 matching lines @@
 #include "base/string_util.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_context.h"
 #include "webkit/api/public/WebData.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/dom_operations_private.h"
 #include "webkit/glue/dom_serializer.h"
 #include "webkit/glue/dom_serializer_delegate.h"
 #include "webkit/glue/glue_util.h"
-#include "webkit/glue/webframe.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webview.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_shell_test.h"
 
 namespace {
 
 class DomSerializerTests : public TestShellTest,
                            public webkit_glue::DomSerializerDelegate {
  public:
@@ skipping 52 matching lines @@
   }
 
   // Load web page according to input content and relative URLs within
   // the document.
   void LoadContents(const std::string& contents,
                     const GURL& base_url,
                     const WebCore::String encoding_info) {
     test_shell_->ResetTestController();
     // If input encoding is empty, use UTF-8 as default encoding.
     if (encoding_info.isEmpty()) {
-      test_shell_->webView()->GetMainFrame()->LoadHTMLString(contents,
+      test_shell_->webView()->GetMainFrame()->loadHTMLString(contents,
                                                              base_url);
     } else {
       // Do not use WebFrame.LoadHTMLString because it assumes that input
       // html contents use UTF-8 encoding.
+      // TODO(darin): This should use WebFrame::loadData.
       WebFrameImpl* web_frame =
           static_cast<WebFrameImpl*>(test_shell_->webView()->GetMainFrame());
       ASSERT_TRUE(web_frame != NULL);
       int len = static_cast<int>(contents.size());
       RefPtr<WebCore::SharedBuffer> buf(
           WebCore::SharedBuffer::create(contents.data(), len));
 
       WebCore::SubstituteData subst_data(
           buf, WebCore::String("text/html"), encoding_info, WebCore::KURL());
       WebCore::ResourceRequest request(webkit_glue::GURLToKURL(base_url),
@@ skipping 685 matching lines @@
   // "hello world"
   WebCore::HTMLElement* body_ele = doc->body();
   ASSERT_TRUE(body_ele != NULL);
   WebCore::Node* text_node = body_ele->firstChild();
   ASSERT_TRUE(text_node->isTextNode());
   const WebCore::String& text_node_contents = text_node->nodeValue();
   ASSERT_TRUE(text_node_contents == WebCore::String("hello world"));
 }
 
 }  // namespace