Remove WebHistoryItem child usage

content/public/test/render_view_test.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_PUBLIC_TEST_RENDER_VIEW_TEST_H_
 #define CONTENT_PUBLIC_TEST_RENDER_VIEW_TEST_H_
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/test/mock_render_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 
 namespace blink {
-class WebHistoryItem;
 class WebWidget;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace content {
 class ContentBrowserClient;
 class ContentClient;
 class ContentRendererClient;
 class MockRenderProcess;
 class RendererMainPlatformDelegate;
 class RendererWebKitPlatformSupportImplNoSandboxImpl;
 class RenderView;
+class PageState;

[Charlie Reis, 2014/04/28 16:29:00]

nit: Alphabetize.

[Nate Chapin, 2014/04/28 17:31:54]

Done.

 
 class RenderViewTest : public testing::Test {
  public:
   // A special WebKitPlatformSupportImpl class for getting rid off the
   // dependency to the sandbox, which is not available in RenderViewTest.
   class RendererWebKitPlatformSupportImplNoSandbox {
    public:
     RendererWebKitPlatformSupportImplNoSandbox();
     ~RendererWebKitPlatformSupportImplNoSandbox();
     blink::Platform* Get();
@@ skipping 22 matching lines @@
   // Returns true if the JavaScript was evaluated correctly to an int value,
   // false otherwise.
   bool ExecuteJavaScriptAndReturnIntValue(const base::string16& script,
                                           int* result);
 
   // Loads the given HTML into the main frame as a data: URL and blocks until
   // the navigation is committed.
   void LoadHTML(const char* html);
 
   // Navigates the main frame back or forward in session history and commits.
-  // The caller must capture a WebHistoryItem for the target page. This is
-  // available from the WebFrame.
-  void GoBack(const blink::WebHistoryItem& item);
-  void GoForward(const blink::WebHistoryItem& item);
+  // The caller must capture a PageState for the target page.
+  void GoBack(const PageState& state);
+  void GoForward(const PageState& state);
 
   // Navigates the main frame back to whatever is considered the previous
   // history entry internally.
   void GoBackToPrevious();
 
   // Sends one native key event over IPC.
   void SendNativeKeyEvent(const NativeWebKeyboardEvent& key_event);
 
   // Send a raw keyboard event to the renderer.
   void SendWebKeyboardEvent(const blink::WebKeyboardEvent& key_event);
@@ skipping 58 matching lines @@
   // Used to setup the process so renderers can run.
   scoped_ptr<RendererMainPlatformDelegate> platform_;
   scoped_ptr<MainFunctionParams> params_;
   scoped_ptr<base::CommandLine> command_line_;
 
 #if defined(OS_MACOSX)
   scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_;
 #endif
 
  private:
-  void GoToOffset(int offset, const blink::WebHistoryItem& history_item);
+  void GoToOffset(int offset, const PageState& state);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_RENDER_VIEW_TEST_H_