Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(466)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/sync/profile_sync_service_session_unittest.cc

Issue 10928017: Moving google_apis and GaiaClient to src/google_apis. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/sync/profile_sync_service_preference_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_startup_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" 21 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
22 #include "chrome/browser/sync/glue/session_change_processor.h" 22 #include "chrome/browser/sync/glue/session_change_processor.h"
23 #include "chrome/browser/sync/glue/session_data_type_controller.h" 23 #include "chrome/browser/sync/glue/session_data_type_controller.h"
24 #include "chrome/browser/sync/glue/session_model_associator.h" 24 #include "chrome/browser/sync/glue/session_model_associator.h"
25 #include "chrome/browser/sync/glue/sync_backend_host.h" 25 #include "chrome/browser/sync/glue/sync_backend_host.h"
26 #include "chrome/browser/sync/profile_sync_components_factory_mock.h" 26 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
27 #include "chrome/browser/sync/profile_sync_service_factory.h" 27 #include "chrome/browser/sync/profile_sync_service_factory.h"
28 #include "chrome/browser/sync/profile_sync_test_util.h" 28 #include "chrome/browser/sync/profile_sync_test_util.h"
29 #include "chrome/browser/sync/test_profile_sync_service.h" 29 #include "chrome/browser/sync/test_profile_sync_service.h"
30 #include "chrome/common/chrome_notification_types.h" 30 #include "chrome/common/chrome_notification_types.h"
31 #include "chrome/common/net/gaia/gaia_constants.h"
32 #include "chrome/test/base/browser_with_test_window_test.h" 31 #include "chrome/test/base/browser_with_test_window_test.h"
33 #include "chrome/test/base/testing_profile.h" 32 #include "chrome/test/base/testing_profile.h"
34 #include "content/public/browser/navigation_entry.h" 33 #include "content/public/browser/navigation_entry.h"
35 #include "content/public/browser/notification_observer.h" 34 #include "content/public/browser/notification_observer.h"
36 #include "content/public/browser/notification_registrar.h" 35 #include "content/public/browser/notification_registrar.h"
37 #include "content/public/browser/notification_service.h" 36 #include "content/public/browser/notification_service.h"
38 #include "content/public/test/test_browser_thread.h" 37 #include "content/public/test/test_browser_thread.h"
38 #include "google_apis/gaia/gaia_constants.h"
39 #include "googleurl/src/gurl.h" 39 #include "googleurl/src/gurl.h"
40 #include "sync/internal_api/public/base/model_type.h" 40 #include "sync/internal_api/public/base/model_type.h"
41 #include "sync/internal_api/public/change_record.h" 41 #include "sync/internal_api/public/change_record.h"
42 #include "sync/internal_api/public/read_node.h" 42 #include "sync/internal_api/public/read_node.h"
43 #include "sync/internal_api/public/read_transaction.h" 43 #include "sync/internal_api/public/read_transaction.h"
44 #include "sync/internal_api/public/write_node.h" 44 #include "sync/internal_api/public/write_node.h"
45 #include "sync/internal_api/public/write_transaction.h" 45 #include "sync/internal_api/public/write_transaction.h"
46 #include "sync/protocol/session_specifics.pb.h" 46 #include "sync/protocol/session_specifics.pb.h"
47 #include "sync/protocol/sync.pb.h" 47 #include "sync/protocol/sync.pb.h"
48 #include "sync/test/engine/test_id_factory.h" 48 #include "sync/test/engine/test_id_factory.h"
(...skipping 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after
1195 sync_pb::SessionSpecifics specifics; 1195 sync_pb::SessionSpecifics specifics;
1196 header.SetSessionSpecifics(specifics); 1196 header.SetSessionSpecifics(specifics);
1197 } 1197 }
1198 // Ensure we associate properly despite the pre-existing node with our local 1198 // Ensure we associate properly despite the pre-existing node with our local
1199 // tag. 1199 // tag.
1200 error = model_associator_->AssociateModels(); 1200 error = model_associator_->AssociateModels();
1201 ASSERT_FALSE(error.IsSet()); 1201 ASSERT_FALSE(error.IsSet());
1202 } 1202 }
1203 1203
1204 } // namespace browser_sync 1204 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service_preference_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_startup_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698