Navigation: move RestoreType and ReloadType into a separate file

android_webview/native/state_serializer.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 "android_webview/native/state_serializer.h"
 
 #include <string>
 
 #include "base/pickle.h"
 #include "base/time/time.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/browser/restore_type.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_state.h"
 
 // Reasons for not re-using TabNavigation under chrome/ as of 20121116:
 // * Android WebView has different requirements for fields to store since
 //   we are the only ones using values like BaseURLForDataURL.
 // * TabNavigation does unnecessary copying of data, which in Android
 //   WebView case, is undesired since save/restore is called in Android
 //   very frequently.
 // * TabNavigation is tightly integrated with the rest of chrome session
@@ skipping 76 matching lines @@
     entries.push_back(content::NavigationEntry::Create());
     if (!internal::RestoreNavigationEntryFromPickle(state_version, iterator,
                                                     entries[i].get()))
       return false;
 
     entries[i]->SetPageID(i);
   }
 
   // |web_contents| takes ownership of these entries after this call.
   content::NavigationController& controller = web_contents->GetController();
-  controller.Restore(
-      selected_entry,
-      content::NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY,
-      &entries);
+  controller.Restore(selected_entry,
+                     content::RestoreType::LAST_SESSION_EXITED_CLEANLY,
+                     &entries);
   DCHECK_EQ(0u, entries.size());
 
   if (controller.GetLastCommittedEntry()) {
     // Set up the file access rights for the selected navigation entry.
     // TODO(joth): This is duplicated from chrome/.../session_restore.cc and
     // should be shared e.g. in  NavigationController. http://crbug.com/68222
     const int id = web_contents->GetRenderProcessHost()->GetID();
     const content::PageState& page_state =
         controller.GetLastCommittedEntry()->GetPageState();
     const std::vector<base::FilePath>& file_paths =
@@ skipping 210 matching lines @@
       return false;
     entry->SetHttpStatusCode(http_status_code);
   }
 
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace android_webview