| 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_file_system/drive_file_sync_service.h" | 5 #include "chrome/browser/sync_file_system/drive_file_sync_service.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "chrome/browser/sync_file_system/mock_remote_change_processor.h" | 23 #include "chrome/browser/sync_file_system/mock_remote_change_processor.h" |
| 24 #include "chrome/browser/sync_file_system/sync_file_system.pb.h" | 24 #include "chrome/browser/sync_file_system/sync_file_system.pb.h" |
| 25 #include "chrome/common/extensions/extension.h" | 25 #include "chrome/common/extensions/extension.h" |
| 26 #include "chrome/common/extensions/extension_builder.h" | 26 #include "chrome/common/extensions/extension_builder.h" |
| 27 #include "chrome/test/base/testing_profile.h" | 27 #include "chrome/test/base/testing_profile.h" |
| 28 #include "content/public/test/test_browser_thread.h" | 28 #include "content/public/test/test_browser_thread.h" |
| 29 #include "extensions/common/id_util.h" | 29 #include "extensions/common/id_util.h" |
| 30 #include "net/base/escape.h" | 30 #include "net/base/escape.h" |
| 31 #include "testing/gmock/include/gmock/gmock.h" | 31 #include "testing/gmock/include/gmock/gmock.h" |
| 32 #include "testing/gtest/include/gtest/gtest.h" | 32 #include "testing/gtest/include/gtest/gtest.h" |
| 33 #include "webkit/fileapi/syncable/sync_direction.h" | 33 #include "webkit/browser/fileapi/syncable/sync_direction.h" |
| 34 #include "webkit/fileapi/syncable/sync_file_metadata.h" | 34 #include "webkit/browser/fileapi/syncable/sync_file_metadata.h" |
| 35 #include "webkit/fileapi/syncable/syncable_file_system_util.h" | 35 #include "webkit/browser/fileapi/syncable/syncable_file_system_util.h" |
| 36 | 36 |
| 37 #if defined(OS_CHROMEOS) | 37 #if defined(OS_CHROMEOS) |
| 38 #include "chrome/browser/chromeos/login/user_manager.h" | 38 #include "chrome/browser/chromeos/login/user_manager.h" |
| 39 #include "chrome/browser/chromeos/settings/cros_settings.h" | 39 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 40 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 40 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
| 41 #endif | 41 #endif |
| 42 | 42 |
| 43 #define FPL(x) FILE_PATH_LITERAL(x) | 43 #define FPL(x) FILE_PATH_LITERAL(x) |
| 44 | 44 |
| 45 using ::testing::AnyNumber; | 45 using ::testing::AnyNumber; |
| (...skipping 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1117 entry->set_kind(google_apis::ENTRY_KIND_FOLDER); | 1117 entry->set_kind(google_apis::ENTRY_KIND_FOLDER); |
| 1118 | 1118 |
| 1119 // Expect to drop this change for file. | 1119 // Expect to drop this change for file. |
| 1120 EXPECT_FALSE(AppendIncrementalRemoteChangeByEntry( | 1120 EXPECT_FALSE(AppendIncrementalRemoteChangeByEntry( |
| 1121 kOrigin, *entry, 1)); | 1121 kOrigin, *entry, 1)); |
| 1122 } | 1122 } |
| 1123 | 1123 |
| 1124 #endif // !defined(OS_ANDROID) | 1124 #endif // !defined(OS_ANDROID) |
| 1125 | 1125 |
| 1126 } // namespace sync_file_system | 1126 } // namespace sync_file_system |
| OLD | NEW |