[sessions] Properly namespace recently-componentized TabRestore code

chrome/browser/android/recently_closed_tabs_bridge.cc

 // Copyright 2013 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/android/recently_closed_tabs_bridge.h"
 
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "components/sessions/core/tab_restore_service.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/RecentlyClosedBridge_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 
 namespace {
 
 void AddTabToList(JNIEnv* env,
-                  TabRestoreService::Entry* entry,
+                  sessions::TabRestoreService::Entry* entry,
                   jobject jtabs_list) {
-  const TabRestoreService::Tab* tab =
-      static_cast<TabRestoreService::Tab*>(entry);
+  const sessions::TabRestoreService::Tab* tab =
+      static_cast<sessions::TabRestoreService::Tab*>(entry);
   const sessions::SerializedNavigationEntry& current_navigation =
       tab->navigations.at(tab->current_navigation_index);
   Java_RecentlyClosedBridge_pushTab(
       env, jtabs_list, entry->id,
       ConvertUTF16ToJavaString(env, current_navigation.title()).obj(),
       ConvertUTF8ToJavaString(env, current_navigation.virtual_url().spec())
           .obj());
 }
 
 void AddTabsToList(JNIEnv* env,
-                   const TabRestoreService::Entries& entries,
+                   const sessions::TabRestoreService::Entries& entries,
                    jobject jtabs_list,
                    int max_tab_count) {
   int added_count = 0;
-  for (TabRestoreService::Entries::const_iterator it = entries.begin();
+  for (sessions::TabRestoreService::Entries::const_iterator it =
+           entries.begin();
        it != entries.end() && added_count < max_tab_count; ++it) {
-    TabRestoreService::Entry* entry = *it;
-    DCHECK_EQ(entry->type, TabRestoreService::TAB);
-    if (entry->type == TabRestoreService::TAB) {
+    sessions::TabRestoreService::Entry* entry = *it;
+    DCHECK_EQ(entry->type, sessions::TabRestoreService::TAB);
+    if (entry->type == sessions::TabRestoreService::TAB) {
       AddTabToList(env, entry, jtabs_list);
       ++added_count;
     }
   }
 }
 
 }  // namespace
 
 RecentlyClosedTabsBridge::RecentlyClosedTabsBridge(Profile* profile)
     : profile_(profile),
@@ skipping 31 matching lines @@
 jboolean RecentlyClosedTabsBridge::OpenRecentlyClosedTab(JNIEnv* env,
                                                          jobject obj,
                                                          jobject jtab,
                                                          jint recent_tab_id,
                                                          jint j_disposition) {
   if (!tab_restore_service_)
     return false;
 
   // Find and remove the corresponding tab entry from TabRestoreService.
   // We take ownership of the returned tab.
-  scoped_ptr<TabRestoreService::Tab> tab_entry(
+  scoped_ptr<sessions::TabRestoreService::Tab> tab_entry(
       tab_restore_service_->RemoveTabEntryById(recent_tab_id));
   if (!tab_entry)
     return false;
 
   TabAndroid* tab_android = TabAndroid::GetNativeTab(env, jtab);
   if (!tab_android)
     return false;
   content::WebContents* web_contents = tab_android->web_contents();
   if (!web_contents)
     return false;
@@ skipping 12 matching lines @@
 }
 
 void RecentlyClosedTabsBridge::ClearRecentlyClosedTabs(JNIEnv* env,
                                                        jobject obj) {
   EnsureTabRestoreService();
   if (tab_restore_service_)
     tab_restore_service_->ClearEntries();
 }
 
 void RecentlyClosedTabsBridge::TabRestoreServiceChanged(
-    TabRestoreService* service) {
+    sessions::TabRestoreService* service) {
   if (callback_.is_null())
     return;
   JNIEnv* env = AttachCurrentThread();
   Java_RecentlyClosedCallback_onUpdated(env, callback_.obj());
 }
 
 void RecentlyClosedTabsBridge::TabRestoreServiceDestroyed(
-    TabRestoreService* service) {
+    sessions::TabRestoreService* service) {
   tab_restore_service_ = NULL;
 }
 
 void RecentlyClosedTabsBridge::EnsureTabRestoreService() {
   if (tab_restore_service_)
     return;
 
   tab_restore_service_ = TabRestoreServiceFactory::GetForProfile(profile_);
 
   // TabRestoreServiceFactory::GetForProfile() can return NULL (e.g. in
@@ skipping 11 matching lines @@
                   const JavaParamRef<jobject>& jprofile) {
   RecentlyClosedTabsBridge* bridge = new RecentlyClosedTabsBridge(
       ProfileAndroid::FromProfileAndroid(jprofile));
   return reinterpret_cast<intptr_t>(bridge);
 }
 
 // static
 bool RecentlyClosedTabsBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }