Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

content/browser/tab_contents/navigation_controller.cc

 // Copyright (c) 2011 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/browser/tab_contents/navigation_controller.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"  // Temporary
 #include "base/string_util.h"
@@ skipping 13 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/content_constants.h"
 #include "net/base/escape.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
 #include "webkit/glue/webkit_glue.h"
 
+using content::BrowserContext;
 using content::GlobalRequestID;
 using content::NavigationEntry;
 using content::NavigationEntryImpl;
 using content::UserMetricsAction;
 using content::WebContents;
 
 namespace {
 
 const int kInvalidateAll = 0xFFFFFFFF;
 
@@ skipping 64 matching lines @@
 }  // namespace
 
 // NavigationController ---------------------------------------------------
 
 const size_t kMaxEntryCountForTestingNotSet = -1;
 
 // static
 size_t NavigationController::max_entry_count_for_testing_ =
     kMaxEntryCountForTestingNotSet;
 
+ // Should Reload check for post data? The default is true, but is set to false
+// when testing.
+static bool g_check_for_repost = true;
+
+namespace content {
 // static
-bool NavigationController::check_for_repost_ = true;
-
-// static
-NavigationEntry* content::NavigationController::CreateNavigationEntry(
+NavigationEntry* NavigationController::CreateNavigationEntry(
       const GURL& url,
-      const content::Referrer& referrer,
-      content::PageTransition transition,
+      const Referrer& referrer,
+      PageTransition transition,
       bool is_renderer_initiated,
       const std::string& extra_headers,
-      content::BrowserContext* browser_context) {
+      BrowserContext* browser_context) {
   // Allow the browser URL handler to rewrite the URL. This will, for example,
   // remove "view-source:" from the beginning of the URL to get the URL that
   // will actually be loaded. This real URL won't be shown to the user, just
   // used internally.
   GURL loaded_url(url);
   bool reverse_on_redirect = false;
   BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
       &loaded_url, browser_context, &reverse_on_redirect);
 
   NavigationEntryImpl* entry = new NavigationEntryImpl(
       NULL,  // The site instance for tabs is sent on navigation
              // (TabContents::GetSiteInstance).
       -1,
       loaded_url,
       referrer,
       string16(),
       transition,
       is_renderer_initiated);
   entry->SetVirtualURL(url);
   entry->set_user_typed_url(url);
   entry->set_update_virtual_url_with_url(reverse_on_redirect);
   entry->set_extra_headers(extra_headers);
   return entry;
 }
 
+// static
+void NavigationController::DisablePromptOnRepost() {

[Jói, 2012/01/04 11:06:33]

Possible follow-up:  Should this be DisablePromptOnRepostForTesting ?

+  g_check_for_repost = false;
+}
+
+}  // namespace content
+
 NavigationController::NavigationController(
     TabContents* contents,
-    content::BrowserContext* browser_context,
+    BrowserContext* browser_context,
     SessionStorageNamespace* session_storage_namespace)
     : browser_context_(browser_context),
       pending_entry_(NULL),
       last_committed_entry_index_(-1),
       pending_entry_index_(-1),
       transient_entry_index_(-1),
       tab_contents_(contents),
       max_restored_page_id_(-1),
       ALLOW_THIS_IN_INITIALIZER_LIST(ssl_manager_(this)),
       needs_reload_(false),
@@ skipping 12 matching lines @@
   content::NotificationService::current()->Notify(
       content::NOTIFICATION_TAB_CLOSED,
       content::Source<content::NavigationController>(this),
       content::NotificationService::NoDetails());
 }
 
 WebContents* NavigationController::GetWebContents() const {
   return tab_contents_;
 }
 
-content::BrowserContext* NavigationController::GetBrowserContext() const {
+BrowserContext* NavigationController::GetBrowserContext() const {
   return browser_context_;
 }
 
+void NavigationController::SetBrowserContext(BrowserContext* browser_context) {
+  browser_context_ = browser_context;
+}
+
 void NavigationController::Restore(
     int selected_navigation,
     bool from_last_session,
     std::vector<NavigationEntry*>* entries) {
   // Verify that this controller is unused and that the input is valid.
   DCHECK(GetEntryCount() == 0 && !GetPendingEntry());
   DCHECK(selected_navigation >= 0 &&
          selected_navigation < static_cast<int>(entries->size()));
 
   needs_reload_ = true;
@@ skipping 22 matching lines @@
     return;
 
   DiscardNonCommittedEntriesInternal();
   int current_index = GetCurrentEntryIndex();
   // If we are no where, then we can't reload.  TODO(darin): We should add a
   // CanReload method.
   if (current_index == -1) {
     return;
   }
 
-  if (check_for_repost_ && check_for_repost &&
+  if (g_check_for_repost && check_for_repost &&
       GetEntryAtIndex(current_index)->GetHasPostData()) {
     // The user is asking to reload a page with POST data. Prompt to make sure
     // they really want to do this. If they do, the dialog will call us back
     // with check_for_repost = false.
     content::NotificationService::current()->Notify(
         content::NOTIFICATION_REPOST_WARNING_SHOWN,
         content::Source<content::NavigationController>(this),
         content::NotificationService::NoDetails());
 
     pending_reload_ = reload_type;
@@ skipping 704 matching lines @@
   return (i == entries_.end()) ? -1 : static_cast<int>(i - entries_.begin());
 }
 
 bool NavigationController::IsURLInPageNavigation(const GURL& url) const {
   NavigationEntry* last_committed = GetLastCommittedEntry();
   if (!last_committed)
     return false;
   return AreURLsInPageNavigation(last_committed->GetURL(), url);
 }
 
-void NavigationController::CopyStateFrom(const NavigationController& source) {
+void NavigationController::CopyStateFrom(
+    const content::NavigationController& temp) {
+  const NavigationController& source =
+      static_cast<const NavigationController&>(temp);
   // Verify that we look new.
   DCHECK(GetEntryCount() == 0 && !GetPendingEntry());
 
   if (source.GetEntryCount() == 0)
     return;  // Nothing new to do.
 
   needs_reload_ = true;
   InsertEntriesFrom(source, source.GetEntryCount());
 
   session_storage_namespace_ = source.session_storage_namespace_->Clone();
@@ skipping 256 matching lines @@
   // notification below instead.
   tab_contents_->NotifyNavigationStateChanged(kInvalidateAll);
 
   content::NotificationService::current()->Notify(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<content::NavigationController>(this),
       notification_details);
 }
 
 // static
-void NavigationController::DisablePromptOnRepost() {
-  check_for_repost_ = false;
-}
-
-// static
 size_t NavigationController::max_entry_count() {
   if (max_entry_count_for_testing_ != kMaxEntryCountForTestingNotSet)
      return max_entry_count_for_testing_;
   return content::kMaxSessionHistoryEntries;
 }
 
 void NavigationController::SetActive(bool is_active) {
   if (is_active && needs_reload_)
     LoadIfNecessary();
 }
@@ skipping 72 matching lines @@
   for (int i = 0; i < max_index; i++) {
     // When cloning a tab, copy all entries except interstitial pages
     if (source.entries_[i].get()->GetPageType() !=
         content::PAGE_TYPE_INTERSTITIAL) {
       entries_.insert(entries_.begin() + insert_index++,
                       linked_ptr<NavigationEntryImpl>(
                           new NavigationEntryImpl(*source.entries_[i])));
     }
   }
 }