OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/js_sync_manager_observer.h" | 5 #include "chrome/browser/sync/js/js_sync_manager_observer.h" |
6 | 6 |
7 #include <cstddef> | 7 #include <cstddef> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
11 #include "base/tracked.h" | 11 #include "base/tracked.h" |
12 #include "base/values.h" | 12 #include "base/values.h" |
13 #include "chrome/browser/sync/engine/syncapi.h" | 13 #include "chrome/browser/sync/engine/syncapi.h" |
14 #include "chrome/browser/sync/js_arg_list.h" | 14 #include "chrome/browser/sync/js/js_arg_list.h" |
15 #include "chrome/browser/sync/js_event_details.h" | 15 #include "chrome/browser/sync/js/js_event_details.h" |
16 #include "chrome/browser/sync/js_test_util.h" | 16 #include "chrome/browser/sync/js/js_test_util.h" |
17 #include "chrome/browser/sync/sessions/session_state.h" | 17 #include "chrome/browser/sync/sessions/session_state.h" |
18 #include "chrome/browser/sync/syncable/model_type.h" | 18 #include "chrome/browser/sync/syncable/model_type.h" |
19 #include "chrome/browser/sync/weak_handle.h" | 19 #include "chrome/browser/sync/weak_handle.h" |
20 #include "chrome/test/sync/engine/test_user_share.h" | 20 #include "chrome/test/sync/engine/test_user_share.h" |
21 #include "testing/gtest/include/gtest/gtest.h" | 21 #include "testing/gtest/include/gtest/gtest.h" |
22 | 22 |
23 namespace browser_sync { | 23 namespace browser_sync { |
24 namespace { | 24 namespace { |
25 | 25 |
26 using ::testing::InSequence; | 26 using ::testing::InSequence; |
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 &trans, &changes[i], | 325 &trans, &changes[i], |
326 syncable::MODEL_TYPE_COUNT - i); | 326 syncable::MODEL_TYPE_COUNT - i); |
327 } | 327 } |
328 | 328 |
329 test_user_share.TearDown(); | 329 test_user_share.TearDown(); |
330 PumpLoop(); | 330 PumpLoop(); |
331 } | 331 } |
332 | 332 |
333 } // namespace | 333 } // namespace |
334 } // namespace browser_sync | 334 } // namespace browser_sync |
OLD | NEW |