Tidy up Android's is-tablet functionality.

chrome/browser/sync/glue/session_model_associator.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 "chrome/browser/sync/glue/session_model_associator.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 50 matching lines @@
     "Server did not create the top-level sessions node. We "
     "might be running against an out-of-date server.";
 
 // The maximum number of navigations in each direction we care to sync.
 static const int kMaxSyncNavigationCount = 6;
 
 // Default number of days without activity after which a session is considered
 // stale and becomes a candidate for garbage collection.
 static const size_t kDefaultStaleSessionThresholdDays = 14;  // 2 weeks.
 
+#if defined(OS_ANDROID)
+bool IsTabletUI() {
+  return CommandLine::ForCurrentProcess()->HasSwitch(switches::kTabletUI);
+}
+#endif
+
 sync_pb::SessionHeader::DeviceType GetLocalDeviceType() {
   // TODO(yfriedman): Refactor/combine with "DeviceInformation" code in
   // sync_manager.cc[1060]
 #if defined(OS_CHROMEOS)
   return sync_pb::SessionHeader_DeviceType_TYPE_CROS;
 #elif defined(OS_LINUX)
   return sync_pb::SessionHeader_DeviceType_TYPE_LINUX;
 #elif defined(OS_MACOSX)
   return sync_pb::SessionHeader_DeviceType_TYPE_MAC;
 #elif defined(OS_WIN)
   return sync_pb::SessionHeader_DeviceType_TYPE_WIN;
 #elif defined(OS_ANDROID)
-  return syncer::internal::IsTabletUi() ?
+  return IsTabletUI() ?
       sync_pb::SessionHeader_DeviceType_TYPE_TABLET :
       sync_pb::SessionHeader_DeviceType_TYPE_PHONE;
 #else
   return sync_pb::SessionHeader_DeviceType_TYPE_OTHER;
 #endif
 }
 
 }  // namespace
 
 SessionModelAssociator::SessionModelAssociator(ProfileSyncService* sync_service,
@@ skipping 1496 matching lines @@
 bool SessionModelAssociator::CryptoReadyIfNecessary() {
   // We only access the cryptographer while holding a transaction.
   syncer::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
   const syncer::ModelTypeSet encrypted_types =
       syncer::GetEncryptedTypes(&trans);
   return !encrypted_types.Has(SESSIONS) ||
          sync_service_->IsCryptographerReady(&trans);
 }
 
 }  // namespace browser_sync