Add Phone/Tablet device types for syncing session from Android.

chrome/browser/sync/glue/session_model_associator.h

Index: chrome/browser/sync/glue/session_model_associator.h
diff --git a/chrome/browser/sync/glue/session_model_associator.h b/chrome/browser/sync/glue/session_model_associator.h
index 267d91d9843467bf09a9c039f35700c0f1c6bb40..79364c194294eaab3b14ef942b1ef5ec9dc876ce 100644
--- a/chrome/browser/sync/glue/session_model_associator.h
+++ b/chrome/browser/sync/glue/session_model_associator.h
@@ -26,6 +26,7 @@
 #include "chrome/browser/sync/glue/synced_session_tracker.h"
 #include "chrome/browser/sync/glue/synced_tab_delegate.h"
 #include "chrome/browser/sync/glue/synced_window_delegate.h"
+#include "chrome/browser/sync/protocol/session_specifics.pb.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 
 class Profile;
@@ -427,6 +428,9 @@ class SessionModelAssociator
   // invalid url's.
   bool TabHasValidEntry(const SyncedTabDelegate& tab) const;
 
+  // Returns the type of the device hosting this session.
+  sync_pb::SessionHeader::DeviceType GetLocalDeviceType();

[Nicolas Zea, 2012/03/14 18:27:14]

Does this have to be exposed via header? If so, perhaps have this one return the
SyncedSession::DeviceType which calls a separate anonymous namespace one in the
cc that returns the protobuf..

[Yaron, 2012/03/14 19:01:01]

Done.

+
   // For testing only.
   void QuitLoopForSubtleTesting();