summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-23 19:28:47 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-23 19:28:47 +0000
commit4b47c247aeadbf6a7967733120defcee2bc69773 (patch)
treea05044719f4cf82d00429b96d0c437923863bc87 /chrome/browser/sync
parent0d1d9582a494445632cd540e5bd768492962b90c (diff)
downloadchromium_src-4b47c247aeadbf6a7967733120defcee2bc69773.zip
chromium_src-4b47c247aeadbf6a7967733120defcee2bc69773.tar.gz
chromium_src-4b47c247aeadbf6a7967733120defcee2bc69773.tar.bz2
Fix bustage by adding friend decl.
TBR=nick Review URL: http://codereview.chromium.org/1192001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/engine/syncer_thread.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/syncer_thread.h b/chrome/browser/sync/engine/syncer_thread.h
index 75ddb32..dddcac8 100644
--- a/chrome/browser/sync/engine/syncer_thread.h
+++ b/chrome/browser/sync/engine/syncer_thread.h
@@ -55,7 +55,7 @@ class SyncerThread : public base::RefCountedThreadSafe<SyncerThread>,
FRIEND_TEST(SyncerThreadWithSyncerTest, Nudge);
FRIEND_TEST(SyncerThreadWithSyncerTest, Throttling);
FRIEND_TEST(SyncerThreadWithSyncerTest, AuthInvalid);
- FRIEND_TEST(SyncerThreadWithSyncerTest, Pause);
+ FRIEND_TEST(SyncerThreadWithSyncerTest, DISABLED_Pause);
friend class SyncerThreadWithSyncerTest;
friend class SyncerThreadFactory;
public: