[sessions] Properly namespace recently-componentized TabRestore code

chrome/browser/sessions/tab_restore_browsertest.cc

 // Copyright (c) 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 "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
@@ skipping 19 matching lines @@
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/net_util.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "url/gurl.h"
 
 // Class used to run a message loop waiting for the TabRestoreService to finish
 // loading. Does nothing if the TabRestoreService was already loaded.
-class WaitForLoadObserver : public TabRestoreServiceObserver {
+class WaitForLoadObserver : public sessions::TabRestoreServiceObserver {
  public:
   explicit WaitForLoadObserver(Browser* browser)
       : tab_restore_service_(
           TabRestoreServiceFactory::GetForProfile(browser->profile())),
         do_wait_(!tab_restore_service_->IsLoaded()) {
     if (do_wait_)
       tab_restore_service_->AddObserver(this);
   }
 
   ~WaitForLoadObserver() override {
     if (do_wait_)
       tab_restore_service_->RemoveObserver(this);
   }
 
   void Wait() {
     if (do_wait_)
       run_loop_.Run();
   }
 
  private:
   // Overridden from TabRestoreServiceObserver:
-  void TabRestoreServiceChanged(TabRestoreService* service) override {}
-  void TabRestoreServiceDestroyed(TabRestoreService* service) override {}
-  void TabRestoreServiceLoaded(TabRestoreService* service) override {
+  void TabRestoreServiceChanged(sessions::TabRestoreService* service) override {
+  }
+  void TabRestoreServiceDestroyed(
+      sessions::TabRestoreService* service) override {}
+  void TabRestoreServiceLoaded(sessions::TabRestoreService* service) override {
     DCHECK(do_wait_);
     run_loop_.Quit();
   }
 
-  TabRestoreService* tab_restore_service_;
+  sessions::TabRestoreService* tab_restore_service_;
   const bool do_wait_;
   base::RunLoop run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(WaitForLoadObserver);
 };
 
 class TabRestoreTest : public InProcessBrowserTest {
  public:
   TabRestoreTest() : active_browser_list_(NULL) {
     url1_ = ui_test_utils::GetTestUrl(
@@ skipping 545 matching lines @@
   while (browser()->tab_strip_model()->count())
     CloseTab(0);
 }
 
 // Verifies restoring a tab works on startup.
 IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreOnStartup) {
   ASSERT_NO_FATAL_FAILURE(RestoreTab(0, 1));
   EXPECT_EQ(url1_,
             browser()->tab_strip_model()->GetWebContentsAt(1)->GetURL());
 }