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

Side by Side Diff: chrome/browser/sync_file_system/drive_file_sync_service_mock_unittest.cc

Issue 15806012: Move webkit/fileapi/syncable/* code to webkit/browser/fileapi (final!) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
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 "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
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/browser/fileapi/syncable/sync_direction.h"
34 #include "webkit/browser/fileapi/syncable/sync_file_metadata.h"
35 #include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
33 #include "webkit/common/fileapi/file_system_util.h" 36 #include "webkit/common/fileapi/file_system_util.h"
34 #include "webkit/fileapi/syncable/sync_direction.h"
35 #include "webkit/fileapi/syncable/sync_file_metadata.h"
36 #include "webkit/fileapi/syncable/syncable_file_system_util.h"
37 37
38 #if defined(OS_CHROMEOS) 38 #if defined(OS_CHROMEOS)
39 #include "chrome/browser/chromeos/login/user_manager.h" 39 #include "chrome/browser/chromeos/login/user_manager.h"
40 #include "chrome/browser/chromeos/settings/cros_settings.h" 40 #include "chrome/browser/chromeos/settings/cros_settings.h"
41 #include "chrome/browser/chromeos/settings/device_settings_service.h" 41 #include "chrome/browser/chromeos/settings/device_settings_service.h"
42 #endif 42 #endif
43 43
44 #define FPL(x) FILE_PATH_LITERAL(x) 44 #define FPL(x) FILE_PATH_LITERAL(x)
45 45
46 using ::testing::AnyNumber; 46 using ::testing::AnyNumber;
(...skipping 988 matching lines...) Expand 10 before | Expand all | Expand 10 after
1035 entry->set_kind(google_apis::ENTRY_KIND_FOLDER); 1035 entry->set_kind(google_apis::ENTRY_KIND_FOLDER);
1036 1036
1037 // Expect to drop this change for file. 1037 // Expect to drop this change for file.
1038 EXPECT_FALSE(AppendIncrementalRemoteChangeByEntry( 1038 EXPECT_FALSE(AppendIncrementalRemoteChangeByEntry(
1039 kOrigin, *entry, 1)); 1039 kOrigin, *entry, 1));
1040 } 1040 }
1041 1041
1042 #endif // !defined(OS_ANDROID) 1042 #endif // !defined(OS_ANDROID)
1043 1043
1044 } // namespace sync_file_system 1044 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698