diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-21 05:19:46 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-21 05:19:46 +0000 |
| commit | e4a739bbe7eceebc94ff9233e4b1614995e3fbcd (patch) | |
| tree | 714964744a87e3ec5bc3a8baa8b5d7450f551b79 /chrome/browser/sync/profile_sync_service_harness.cc | |
| parent | a97895c126f6e7afef08c3e58fe454d2ec3944c0 (diff) | |
| download | chromium_src-e4a739bbe7eceebc94ff9233e4b1614995e3fbcd.zip chromium_src-e4a739bbe7eceebc94ff9233e4b1614995e3fbcd.tar.gz chromium_src-e4a739bbe7eceebc94ff9233e4b1614995e3fbcd.tar.bz2 | |
Revert 118589 - Re-commit r117965 and 117130 with a prospective fix for perf regression.
Reverting due to linux sync integration test crashes, and a memory leak.
BUG=108017
TEST=none
TBR=tim@chromium.org,jamesr@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9141027
TBR=atwilson@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9226042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_harness.cc')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_harness.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc index e3441bf..59ec996 100644 --- a/chrome/browser/sync/profile_sync_service_harness.cc +++ b/chrome/browser/sync/profile_sync_service_harness.cc @@ -20,9 +20,9 @@ #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/sync/glue/data_type_controller.h" #include "chrome/browser/sync/sessions/session_state.h" +#include "chrome/browser/sync/signin_manager.h" #include "chrome/browser/sync/sync_ui_util.h" using browser_sync::sessions::SyncSessionSnapshot; |