diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 01:12:29 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 01:12:29 +0000 |
| commit | 3ef741021d8713318906d33b5920d59ad13727db (patch) | |
| tree | 0de5b6e0e6cf4763d7643a7fd37501ba41c2896a /chrome/browser/sync/test_profile_sync_service.cc | |
| parent | e9c4caea5b4e27268d893d1cb629bc966ca83631 (diff) | |
| download | chromium_src-3ef741021d8713318906d33b5920d59ad13727db.zip chromium_src-3ef741021d8713318906d33b5920d59ad13727db.tar.gz chromium_src-3ef741021d8713318906d33b5920d59ad13727db.tar.bz2 | |
Revert SigninManager changes to see if they were the cause of the perf regression.
Revert "Moved SigninManager out of browser/sync, and start changing the code so signin"
This reverts commit 897f42f222022acb470de4e8cd369862139583f2.
Revert "Make SigninManager a ProfileKeyedService."
This reverts commit b29413fd67465671335091b2b7e3bb7ed2f62e0f.
BUG=108017
TEST=watch perf bots, see if perf regression disappears
TBR=jamesr@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9251031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/test_profile_sync_service.cc')
| -rw-r--r-- | chrome/browser/sync/test_profile_sync_service.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc index 90c71d4..f6802d4 100644 --- a/chrome/browser/sync/test_profile_sync_service.cc +++ b/chrome/browser/sync/test_profile_sync_service.cc @@ -1,10 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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_profile_sync_service.h" -#include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/sync/abstract_profile_sync_service_test.h" #include "chrome/browser/sync/glue/data_type_controller.h" #include "chrome/browser/sync/glue/sync_backend_host.h" @@ -13,6 +12,7 @@ #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/sync/protocol/encryption.pb.h" #include "chrome/browser/sync/sessions/session_state.h" +#include "chrome/browser/sync/signin_manager.h" #include "chrome/browser/sync/syncable/directory_manager.h" #include "chrome/browser/sync/syncable/syncable.h" #include "chrome/browser/sync/test/test_http_bridge_factory.h" @@ -142,8 +142,7 @@ TestProfileSyncService::TestProfileSyncService( SetSyncSetupCompleted(); } -TestProfileSyncService::~TestProfileSyncService() { -} +TestProfileSyncService::~TestProfileSyncService() {} void TestProfileSyncService::SetInitialSyncEndedForAllTypes() { UserShare* user_share = GetUserShare(); |