Android: Remove more browser extensions code, and fullscreen ui.

chrome/browser/sessions/tab_restore_service_helper.cc

Index: chrome/browser/sessions/tab_restore_service_helper.cc
diff --git a/chrome/browser/sessions/tab_restore_service_helper.cc b/chrome/browser/sessions/tab_restore_service_helper.cc
index 8c6d777b5fd21c39b833597f8e03769375f2e84b..b5ec2580218bc9c27807070804c0388e7db88682 100644
--- a/chrome/browser/sessions/tab_restore_service_helper.cc
+++ b/chrome/browser/sessions/tab_restore_service_helper.cc
@@ -14,22 +14,19 @@
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service_delegate.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
-#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/session_storage_namespace.h"
 #include "content/public/browser/web_contents.h"
-#include "extensions/browser/extension_registry.h"
-#include "extensions/common/extension.h"
-#include "extensions/common/extension_set.h"
-
-#if !defined(OS_ANDROID)
-#include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"
-#endif
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/tab_helper.h"
+#include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"
+#include "chrome/common/extensions/extension_constants.h"
+#include "extensions/browser/extension_registry.h"
+#include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #endif
 
 using content::NavigationController;
@@ -39,7 +36,7 @@ using content::WebContents;
 namespace {
 
 void RecordAppLaunch(Profile* profile, const TabRestoreService::Tab& tab) {
-#if !defined(OS_ANDROID)
+#if defined(ENABLE_EXTENSIONS)
   GURL url = tab.navigations.at(tab.current_navigation_index).virtual_url();
   const extensions::Extension* extension =
       extensions::ExtensionRegistry::Get(profile)
@@ -50,7 +47,7 @@ void RecordAppLaunch(Profile* profile, const TabRestoreService::Tab& tab) {
   CoreAppLauncherHandler::RecordAppLaunchType(
       extension_misc::APP_LAUNCH_NTP_RECENTLY_CLOSED,
       extension->GetType());
-#endif  // !defined(OS_ANDROID)
+#endif  // defined(ENABLE_EXTENSIONS)
 }
 
 }  // namespace