Making profile avatars and names sync.

chrome/browser/sync/test/integration/sync_test.cc

 // Copyright (c) 2011 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/test/integration/sync_test.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 689 matching lines @@
   ASSERT_EQ("Sync Tabs",
             UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
 }
 
 int SyncTest::NumberOfDefaultSyncItems() const {
   // Just return the current number of basic sync items that are synced,
   // including preferences, themes, and search engines.
   // TODO(stevet): It would be nice if there was some mechanism for retrieving
   // this sum from each data type without having to manually count and update
   // this value.
-  return 7;
+  return 9;
 }
 
 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
                               const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SetProxyConfigCallback, &done,
                  make_scoped_refptr(context_getter), proxy_config));
   done.Wait();
 }