Refactor Android's NetworckChangeNotifier.

chrome/browser/sync/glue/session_model_associator.cc

Index: chrome/browser/sync/glue/session_model_associator.cc
diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc
index feef2cc5ac795766cdef48ae26ec68e237164f75..ab2230e867821320dd78d99fd94677672b4f4bcb 100644
--- a/chrome/browser/sync/glue/session_model_associator.cc
+++ b/chrome/browser/sync/glue/session_model_associator.cc
@@ -68,6 +68,12 @@ static const int kMaxSyncNavigationCount = 6;
 // 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]
@@ -80,7 +86,7 @@ sync_pb::SessionHeader::DeviceType GetLocalDeviceType() {
 #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