Introduce content::PageState

content/shell/webkit_test_controller.cc

 // 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.
 
 #include "content/shell/webkit_test_controller.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 11 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/common/webkit_test_helpers.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_context.h"
 #include "content/shell/shell_content_browser_client.h"
-#include "webkit/glue/glue_serialize.h"
 #include "webkit/support/webkit_support_gfx.h"
 
 namespace content {
 
 const int kTestTimeoutMilliseconds = 30 * 1000;
 // 0x20000000ms is big enough for the purpose to avoid timeout in debugging.
 const int kCloseEnoughToInfinity = 0x20000000;
 
 const int kTestWindowWidthDip = 800;
 const int kTestWindowHeightDip = 600;
@@ skipping 515 matching lines @@
   main_window_->Reload();
 }
 
 void WebKitTestController::OnLoadURLForFrame(const GURL& url,
                                              const std::string& frame_name) {
   main_window_->LoadURLForFrame(url, frame_name);
 }
 
 void WebKitTestController::OnCaptureSessionHistory() {
   std::vector<int> routing_ids;
-  std::vector<std::vector<std::string> > session_histories;
+  std::vector<std::vector<PageState> > session_histories;
   std::vector<unsigned> current_entry_indexes;
 
   RenderViewHost* render_view_host =
       main_window_->web_contents()->GetRenderViewHost();
 
   for (std::vector<Shell*>::iterator window = Shell::windows().begin();
        window != Shell::windows().end();
        ++window) {
     WebContents* web_contents = (*window)->web_contents();
     // Only capture the history from windows in the same process as the main
     // window. During layout tests, we only use two processes when an
     // devtools window is open. This should not happen during history navigation
     // tests.
     if (render_view_host->GetProcess() !=
         web_contents->GetRenderViewHost()->GetProcess()) {
       NOTREACHED();
       continue;
     }
     routing_ids.push_back(web_contents->GetRenderViewHost()->GetRoutingID());
     current_entry_indexes.push_back(
         web_contents->GetController().GetCurrentEntryIndex());
-    std::vector<std::string> history;
+    std::vector<PageState> history;
     for (int entry = 0; entry < web_contents->GetController().GetEntryCount();
          ++entry) {
-      std::string state = web_contents->GetController().GetEntryAtIndex(entry)
-          ->GetContentState();
-      if (state.empty()) {
-        state = webkit_glue::CreateHistoryStateForURL(
+      PageState state = web_contents->GetController().GetEntryAtIndex(entry)->
+          GetPageState();
+      if (!state.IsValid()) {
+        state = PageState::CreateFromURL(
             web_contents->GetController().GetEntryAtIndex(entry)->GetURL());
       }
       history.push_back(state);
     }
     session_histories.push_back(history);
   }
 
   Send(new ShellViewMsg_SessionHistory(render_view_host->GetRoutingID(),
                                        routing_ids,
                                        session_histories,
                                        current_entry_indexes));
 }
 
 void WebKitTestController::OnCloseRemainingWindows() {
   DevToolsManager::GetInstance()->CloseAllClientHosts();
   std::vector<Shell*> open_windows(Shell::windows());
   for (size_t i = 0; i < open_windows.size(); ++i) {
     if (open_windows[i] != main_window_)
       open_windows[i]->Close();
   }
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 void WebKitTestController::OnResetDone() {
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::MessageLoop::QuitClosure());
 }
 
 }  // namespace content