Remove static initialization from navigation_controller.cc

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 85 matching lines @@
   url_canon::Replacements<char> replacements;
   replacements.ClearRef();
   return existing_url.ReplaceComponents(replacements) ==
       new_url.ReplaceComponents(replacements);
 }
 
 }  // namespace
 
 // NavigationController ---------------------------------------------------
 
+const size_t kMaxEntryCountForTestingNotSet = -1;
+
 // static
-size_t NavigationController::max_entry_count_ =
-    content::kMaxSessionHistoryEntries;
+size_t NavigationController::max_entry_count_for_testing_ =
+    kMaxEntryCountForTestingNotSet;
 
 // static
 bool NavigationController::check_for_repost_ = true;
 
 NavigationController::NavigationController(
     TabContents* contents,
     content::BrowserContext* browser_context,
     SessionStorageNamespace* session_storage_namespace)
     : browser_context_(browser_context),
       pending_entry_(NULL),
@@ skipping 999 matching lines @@
     int num_pruned = 0;
     while (last_committed_entry_index_ < (current_size - 1)) {
       num_pruned++;
       entries_.pop_back();
       current_size--;
     }
     if (num_pruned > 0)  // Only notify if we did prune something.
       NotifyPrunedEntries(this, false, num_pruned);
   }
 
-  if (entries_.size() >= max_entry_count_) {
+  if (entries_.size() >= max_entry_count()) {
     RemoveEntryAtIndex(0, GURL());
     NotifyPrunedEntries(this, true, 1);
   }
 
   entries_.push_back(linked_ptr<NavigationEntry>(entry));
   last_committed_entry_index_ = static_cast<int>(entries_.size()) - 1;
 
   // This is a new page ID, so we need everybody to know about it.
   tab_contents_->UpdateMaxPageID(entry->page_id());
 }
@@ skipping 58 matching lines @@
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<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();
 }
 
 void NavigationController::LoadIfNecessary() {
   if (!needs_reload_)
     return;
 
   // Calling Reload() results in ignoring state, and not loading.
@@ skipping 66 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()->page_type() !=
         content::PAGE_TYPE_INTERSTITIAL) {
       entries_.insert(entries_.begin() + insert_index++,
                       linked_ptr<NavigationEntry>(
                           new NavigationEntry(*source.entries_[i])));
     }
   }
 }