[sessions] Properly namespace recently-componentized TabRestore code

components/sessions/core/tab_restore_service_helper.cc

 // Copyright 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 "components/sessions/core/tab_restore_service_helper.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "components/sessions/core/live_tab.h"
 #include "components/sessions/core/tab_restore_service_client.h"
 #include "components/sessions/core/tab_restore_service_delegate.h"
 #include "components/sessions/core/tab_restore_service_observer.h"
 #include "components/sessions/serialized_navigation_entry.h"
 #include "components/sessions/session_types.h"
 
-using sessions::LiveTab;
+namespace sessions {
 
 // TabRestoreServiceHelper::Observer -------------------------------------------
 
 TabRestoreServiceHelper::Observer::~Observer() {}
 
 void TabRestoreServiceHelper::Observer::OnClearEntries() {}
 
 void TabRestoreServiceHelper::Observer::OnRestoreEntryById(
     SessionID::id_type id,
     Entries::const_iterator entry_iterator) {
 }
 
 void TabRestoreServiceHelper::Observer::OnAddEntry() {}
 
 // TabRestoreServiceHelper -----------------------------------------------------
 
 TabRestoreServiceHelper::TabRestoreServiceHelper(
     TabRestoreService* tab_restore_service,
     Observer* observer,
-    sessions::TabRestoreServiceClient* client,
+    TabRestoreServiceClient* client,
     TabRestoreService::TimeFactory* time_factory)
     : tab_restore_service_(tab_restore_service),
       observer_(observer),
       client_(client),
       restoring_(false),
       time_factory_(time_factory) {
   DCHECK(tab_restore_service_);
 }
 
 TabRestoreServiceHelper::~TabRestoreServiceHelper() {
@@ skipping 311 matching lines @@
 void TabRestoreServiceHelper::PopulateTab(Tab* tab,
                                           int index,
                                           TabRestoreServiceDelegate* delegate,
                                           LiveTab* live_tab) {
   const int pending_index = live_tab->GetPendingEntryIndex();
   int entry_count = live_tab->GetEntryCount();
   if (entry_count == 0 && pending_index == 0)
     entry_count++;
   tab->navigations.resize(static_cast<int>(entry_count));
   for (int i = 0; i < entry_count; ++i) {
-    sessions::SerializedNavigationEntry entry =
-        (i == pending_index) ? live_tab->GetPendingEntry()
-                             : live_tab->GetEntryAtIndex(i);
+    SerializedNavigationEntry entry = (i == pending_index)
+                                          ? live_tab->GetPendingEntry()
+                                          : live_tab->GetEntryAtIndex(i);
     tab->navigations[i] = entry;
   }
   tab->timestamp = TimeNow();
   tab->current_navigation_index = live_tab->GetCurrentEntryIndex();
   if (tab->current_navigation_index == -1 && entry_count > 0)
     tab->current_navigation_index = 0;
   tab->tabstrip_index = index;
 
   tab->extension_app_id = client_->GetExtensionAppIDForTab(live_tab);
 
@@ skipping 141 matching lines @@
       Tab* tab = static_cast<Tab*>(entry);
       if (tab->browser_id == old_id)
         tab->browser_id = new_id;
     }
   }
 }
 
 base::Time TabRestoreServiceHelper::TimeNow() const {
   return time_factory_ ? time_factory_->TimeNow() : base::Time::Now();
 }
+
+}  // namespace sessions