sync: Include control types in node browser

sync/internal_api/sync_manager_impl.cc

Index: sync/internal_api/sync_manager_impl.cc
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index 7658f58184992692a5aecf129d15e6bcfc6ead50..a742690d6423a29db7518d9ff235edd371c257dd 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -958,8 +958,10 @@ scoped_ptr<base::ListValue> SyncManagerImpl::GetAllNodesForType(
   DirectoryTypeDebugInfoEmitterMap::iterator it = emitter_map->find(type);
 
   if (it == emitter_map->end()) {
-    NOTREACHED() << "Asked to return debug info for invalid type "
-                 << ModelTypeToString(type);
+    // This can happen in some cases.  The UI thread makes requests of us
+    // when it doesn't really know which types are enabled or disabled.
+    DLOG(WARNING) << "Asked to return debug info for invalid type "
+                  << ModelTypeToString(type);
     return scoped_ptr<base::ListValue>();
   }