diff options
| -rw-r--r-- | chrome/browser/sync/internal_api/sync_manager.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/sync/internal_api/sync_manager.cc b/chrome/browser/sync/internal_api/sync_manager.cc index 709c61d..8b3eabf 100644 --- a/chrome/browser/sync/internal_api/sync_manager.cc +++ b/chrome/browser/sync/internal_api/sync_manager.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -603,7 +603,6 @@ class NudgeStrategy { static NudgeDelayStrategy GetNudgeDelayStrategy(const ModelType& type) { switch (type) { case syncable::AUTOFILL: - case syncable::AUTOFILL_PROFILE: return ACCOMPANY_ONLY; case syncable::PREFERENCES: case syncable::SESSIONS: diff --git a/chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc index 186dc5c..b1637d0 100644 --- a/chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc +++ b/chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -164,10 +164,7 @@ const std::string AutofillSyncPerfTest::IntToValue(int n) { return StringPrintf("Value%d", n); } - -// TODO(lipalani): Bug 108321. Make a bookmark change so it syncs right away. -IN_PROC_BROWSER_TEST_F(AutofillSyncPerfTest, - DISABLED_AutofillProfiles_P0) { +IN_PROC_BROWSER_TEST_F(AutofillSyncPerfTest, AutofillProfiles_P0) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; // TCM ID - 7557873. |