Rename NavigationController to NavigationControllerImpl and put it into the content namespace. Al...

chrome/browser/sessions/base_session_service.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 "chrome/browser/sessions/base_session_service.h"
 
 #include "base/bind.h"
 #include "base/pickle.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/referrer.h"
 #include "webkit/glue/webkit_glue.h"
 
+using WebKit::WebReferrerPolicy;
 using content::BrowserThread;
-using WebKit::WebReferrerPolicy;
+using content::NavigationEntry;
 
 // InternalGetCommandsRequest -------------------------------------------------
 
 BaseSessionService::InternalGetCommandsRequest::~InternalGetCommandsRequest() {
   STLDeleteElements(&commands);
 }
 
 // BaseSessionService ---------------------------------------------------------
 
 namespace {
@@ skipping 98 matching lines @@
   if (pending_reset_) {
     commands_since_reset_ = 0;
     pending_reset_ = false;
   }
 }
 
 SessionCommand* BaseSessionService::CreateUpdateTabNavigationCommand(
     SessionID::id_type command_id,
     SessionID::id_type tab_id,
     int index,
-    const content::NavigationEntry& entry) {
+    const NavigationEntry& entry) {
   // Use pickle to handle marshalling.
   Pickle pickle;
   pickle.WriteInt(tab_id);
   pickle.WriteInt(index);
 
   // We only allow navigations up to 63k (which should be completely
   // reasonable). On the off chance we get one that is too big, try to
   // keep the url.
 
   // Bound the string data (which is variable length) to
@@ skipping 130 matching lines @@
   if (profile_ && BrowserThread::IsMessageLoopValid(BrowserThread::FILE)) {
     return BrowserThread::PostTask(BrowserThread::FILE, from_here, task);
   } else {
     // Fall back to executing on the main thread if the file thread
     // has gone away (around shutdown time) or if we're running as
     // part of a unit test that does not set profile_.
     task.Run();
     return true;
   }
 }