chrome/browser/chromeos/drive/drive_test_util.cc - Issue 11348030: Revert 164876 - Set root resource ID upon full feed update.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/drive/drive_test_util.cc

Issue 11348030: Revert 164876 - Set root resource ID upon full feed update. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 1 month 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/chromeos/drive/drive_resource_metadata_unittest.cc ('k') | no next file » | no next file with comments »

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/chromeos/drive/drive_test_util.h"	5 #include "chrome/browser/chromeos/drive/drive_test_util.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "base/json/json_file_value_serializer.h"	9 #include "base/json/json_file_value_serializer.h"

10 #include "chrome/browser/chromeos/drive/drive.pb.h"	10 #include "chrome/browser/chromeos/drive/drive.pb.h"

(...skipping 105 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
116 ASSERT_TRUE(document.get());	116 ASSERT_TRUE(document.get());

117 ASSERT_TRUE(document->GetType() == Value::TYPE_DICTIONARY);	117 ASSERT_TRUE(document->GetType() == Value::TYPE_DICTIONARY);

118 scoped_ptr<google_apis::DocumentFeed> document_feed(	118 scoped_ptr<google_apis::DocumentFeed> document_feed(

119 google_apis::DocumentFeed::ExtractAndParse(*document));	119 google_apis::DocumentFeed::ExtractAndParse(*document));

120 ASSERT_TRUE(document_feed.get());	120 ASSERT_TRUE(document_feed.get());

121 ScopedVector<google_apis::DocumentFeed> feed_list;	121 ScopedVector<google_apis::DocumentFeed> feed_list;

122 feed_list.push_back(document_feed.release());	122 feed_list.push_back(document_feed.release());

123	123

124 file_system->feed_loader()->UpdateFromFeed(feed_list,	124 file_system->feed_loader()->UpdateFromFeed(feed_list,

125 start_changestamp,	125 start_changestamp,

126 root_feed_changestamp,	126 root_feed_changestamp);

127 // root_resource_id

128 "folder:testroot");

129 }	127 }

130	128

131 } // namespace test_util	129 } // namespace test_util

132 } // namespace drive	130 } // namespace drive

OLD	NEW