[sessions] Properly namespace recently-componentized TabRestore code

chrome/browser/sessions/session_restore_browsertest.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 <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/memory_pressure_listener.h"
 #include "base/process/launch.h"
@@ skipping 487 matching lines @@
   }
   {
     content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::AddSelectedTabWithURL(browser(), url3,
                                   ui::PAGE_TRANSITION_LINK);
     observer.Wait();
   }
 
-  TabRestoreService* service =
+  sessions::TabRestoreService* service =
       TabRestoreServiceFactory::GetForProfile(browser()->profile());
   service->ClearEntries();
 
   chrome::HostDesktopType host_desktop_type = browser()->host_desktop_type();
 
   browser()->window()->Close();
 
   // Expect a window with three tabs.
   ASSERT_EQ(1U, service->entries().size());
-  ASSERT_EQ(TabRestoreService::WINDOW, service->entries().front()->type);
-  const TabRestoreService::Window* window =
-      static_cast<TabRestoreService::Window*>(service->entries().front());
+  ASSERT_EQ(sessions::TabRestoreService::WINDOW,
+            service->entries().front()->type);
+  const sessions::TabRestoreService::Window* window =
+      static_cast<sessions::TabRestoreService::Window*>(
+          service->entries().front());
   EXPECT_EQ(3U, window->tabs.size());
 
   // Find the SessionID for entry2. Since the session service was destroyed,
   // there is no guarantee that the SessionID for the tab has remained the same.
   base::Time timestamp;
   int http_status_code = 0;
-  for (std::vector<TabRestoreService::Tab>::const_iterator it =
-           window->tabs.begin(); it != window->tabs.end(); ++it) {
-    const TabRestoreService::Tab& tab = *it;
+  for (std::vector<sessions::TabRestoreService::Tab>::const_iterator it =
+           window->tabs.begin();
+       it != window->tabs.end(); ++it) {
+    const sessions::TabRestoreService::Tab& tab = *it;
     // If this tab held url2, then restore this single tab.
     if (tab.navigations[0].virtual_url() == url2) {
       timestamp = tab.navigations[0].timestamp();
       http_status_code = tab.navigations[0].http_status_code();
       std::vector<sessions::LiveTab*> content =
           service->RestoreEntryById(NULL, tab.id, host_desktop_type, UNKNOWN);
       ASSERT_EQ(1U, content.size());
       ASSERT_TRUE(content[0]);
       EXPECT_EQ(url2, static_cast<sessions::ContentLiveTab*>(content[0])
                           ->web_contents()
                           ->GetURL());
       break;
     }
   }
   EXPECT_FALSE(timestamp.is_null());
   EXPECT_EQ(200, http_status_code);
 
   // Make sure that the restored tab is removed from the service.
   ASSERT_EQ(1U, service->entries().size());
-  ASSERT_EQ(TabRestoreService::WINDOW, service->entries().front()->type);
-  window = static_cast<TabRestoreService::Window*>(service->entries().front());
+  ASSERT_EQ(sessions::TabRestoreService::WINDOW,
+            service->entries().front()->type);
+  window = static_cast<sessions::TabRestoreService::Window*>(
+      service->entries().front());
   EXPECT_EQ(2U, window->tabs.size());
 
   // Make sure that the restored tab was restored with the correct
   // timestamp and status code.
   const content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(contents);
   const content::NavigationEntry* entry =
       contents->GetController().GetActiveEntry();
   ASSERT_TRUE(entry);
   EXPECT_EQ(timestamp, entry->GetTimestamp());
   EXPECT_EQ(http_status_code, entry->GetHttpStatusCode());
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, WindowWithOneTab) {
   GURL url(ui_test_utils::GetTestUrl(
       base::FilePath(base::FilePath::kCurrentDirectory),
       base::FilePath(FILE_PATH_LITERAL("title1.html"))));
 
   // Add a single tab.
   ui_test_utils::NavigateToURL(browser(), url);
 
-  TabRestoreService* service =
+  sessions::TabRestoreService* service =
       TabRestoreServiceFactory::GetForProfile(browser()->profile());
   service->ClearEntries();
   EXPECT_EQ(0U, service->entries().size());
 
   chrome::HostDesktopType host_desktop_type = browser()->host_desktop_type();
 
   // Close the window.
   browser()->window()->Close();
 
   // Expect the window to be converted to a tab by the TRS.
   EXPECT_EQ(1U, service->entries().size());
-  ASSERT_EQ(TabRestoreService::TAB, service->entries().front()->type);
-  const TabRestoreService::Tab* tab =
-      static_cast<TabRestoreService::Tab*>(service->entries().front());
+  ASSERT_EQ(sessions::TabRestoreService::TAB, service->entries().front()->type);
+  const sessions::TabRestoreService::Tab* tab =
+      static_cast<sessions::TabRestoreService::Tab*>(
+          service->entries().front());
 
   // Restore the tab.
   std::vector<sessions::LiveTab*> content =
       service->RestoreEntryById(NULL, tab->id, host_desktop_type, UNKNOWN);
   ASSERT_EQ(1U, content.size());
   ASSERT_TRUE(content[0]);
   EXPECT_EQ(url, static_cast<sessions::ContentLiveTab*>(content[0])
                      ->web_contents()
                      ->GetURL());
 
@@ skipping 911 matching lines @@
   // automatically at the start of the test.
   for (size_t i = 1; i < web_contents().size(); i++) {
     GURL expected_url = GURL(kUrls[activation_order[kExpectedNumTabs - i]]);
     ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL());
     if (i > 0) {
       ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(),
                 web_contents()[i]->GetLastActiveTime());
     }
   }
 }