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

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

Issue 15023022: Add to be fetched files instead of DriveMetadataStore.batch_sync_origins_ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tzik review, test revisions Created 7 years, 7 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "chrome/browser/sync_file_system/drive/fake_api_util.h" 8 #include "chrome/browser/sync_file_system/drive/fake_api_util.h"
9 #include "chrome/browser/sync_file_system/drive_metadata_store.h" 9 #include "chrome/browser/sync_file_system/drive_metadata_store.h"
10 #include "chrome/browser/sync_file_system/sync_file_system.pb.h" 10 #include "chrome/browser/sync_file_system/sync_file_system.pb.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 fake_api_util()->PushRemoteChange("parent_id", 108 fake_api_util()->PushRemoteChange("parent_id",
109 "parent_title", 109 "parent_title",
110 "uninstall_me_folder", 110 "uninstall_me_folder",
111 origin_dir_resource_id, 111 origin_dir_resource_id,
112 "resource_md5", 112 "resource_md5",
113 SYNC_FILE_TYPE_FILE, 113 SYNC_FILE_TYPE_FILE,
114 false); 114 false);
115 115
116 // Add meta_data entry so GURL->resourse_id mapping is there. 116 // Add meta_data entry so GURL->resourse_id mapping is there.
117 const GURL origin_gurl("chrome-extension://uninstallme"); 117 const GURL origin_gurl("chrome-extension://uninstallme");
118 metadata_store()->AddBatchSyncOrigin(origin_gurl, 118 metadata_store()->AddIncrementalSyncOrigin(origin_gurl,
119 origin_dir_resource_id); 119 origin_dir_resource_id);
120
120 // Delete the origin directory. 121 // Delete the origin directory.
121 bool done = false; 122 bool done = false;
122 sync_service()->UninstallOrigin( 123 sync_service()->UninstallOrigin(
123 origin_gurl, 124 origin_gurl,
124 base::Bind(&ExpectEqStatus, &done, SYNC_STATUS_OK)); 125 base::Bind(&ExpectEqStatus, &done, SYNC_STATUS_OK));
125 message_loop()->RunUntilIdle(); 126 message_loop()->RunUntilIdle();
126 EXPECT_TRUE(done); 127 EXPECT_TRUE(done);
127 128
128 // Assert the App's origin folder was marked as deleted. 129 // Assert the App's origin folder was marked as deleted.
129 EXPECT_TRUE(fake_api_util()->remote_resources().find(origin_dir_resource_id) 130 EXPECT_TRUE(fake_api_util()->remote_resources().find(origin_dir_resource_id)
130 ->second.deleted); 131 ->second.deleted);
131 } 132 }
132 133
133 } // namespace sync_file_system 134 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698