| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" | 5 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" | 
| 6 | 6 | 
| 7 #include "base/bind.h" | 7 #include "base/bind.h" | 
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" | 
| 9 #include "base/location.h" | 9 #include "base/location.h" | 
| 10 #include "chrome/browser/sync/internal_api/write_transaction.h" |  | 
| 11 #include "chrome/browser/sync/test_profile_sync_service.h" | 10 #include "chrome/browser/sync/test_profile_sync_service.h" | 
|  | 11 #include "sync/internal_api/write_transaction.h" | 
| 12 #include "sync/protocol/sync.pb.h" | 12 #include "sync/protocol/sync.pb.h" | 
| 13 #include "sync/syncable/syncable.h" | 13 #include "sync/syncable/syncable.h" | 
| 14 #include "sync/test/engine/test_id_factory.h" | 14 #include "sync/test/engine/test_id_factory.h" | 
| 15 #include "sync/util/cryptographer.h" | 15 #include "sync/util/cryptographer.h" | 
| 16 | 16 | 
| 17 using browser_sync::TestIdFactory; | 17 using browser_sync::TestIdFactory; | 
| 18 using content::BrowserThread; | 18 using content::BrowserThread; | 
| 19 using sync_api::UserShare; | 19 using sync_api::UserShare; | 
| 20 using syncable::BASE_VERSION; | 20 using syncable::BASE_VERSION; | 
| 21 using syncable::CREATE; | 21 using syncable::CREATE; | 
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 145   return callback_; | 145   return callback_; | 
| 146 } | 146 } | 
| 147 | 147 | 
| 148 bool CreateRootHelper::success() { | 148 bool CreateRootHelper::success() { | 
| 149   return success_; | 149   return success_; | 
| 150 } | 150 } | 
| 151 | 151 | 
| 152 void CreateRootHelper::CreateRootCallback() { | 152 void CreateRootHelper::CreateRootCallback() { | 
| 153   success_ = test_->CreateRoot(model_type_); | 153   success_ = test_->CreateRoot(model_type_); | 
| 154 } | 154 } | 
| OLD | NEW | 
|---|