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

Side by Side Diff: chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc

Issue 10830211: Revert 150436 - gdata: Remove hide_hosted_documents from ReadDirectoryCallback (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 796
797 virtual void GetEntryInfoCallback( 797 virtual void GetEntryInfoCallback(
798 GDataFileError error, 798 GDataFileError error,
799 scoped_ptr<GDataEntryProto> entry_proto) { 799 scoped_ptr<GDataEntryProto> entry_proto) {
800 last_error_ = error; 800 last_error_ = error;
801 entry_proto_ = entry_proto.Pass(); 801 entry_proto_ = entry_proto.Pass();
802 } 802 }
803 803
804 virtual void ReadDirectoryCallback( 804 virtual void ReadDirectoryCallback(
805 GDataFileError error, 805 GDataFileError error,
806 bool /* hide_hosted_documents */,
806 scoped_ptr<GDataEntryProtoVector> entries) { 807 scoped_ptr<GDataEntryProtoVector> entries) {
807 last_error_ = error; 808 last_error_ = error;
808 directory_entries_ = entries.Pass(); 809 directory_entries_ = entries.Pass();
809 } 810 }
810 811
811 GDataFileError last_error_; 812 GDataFileError last_error_;
812 FilePath download_path_; 813 FilePath download_path_;
813 FilePath opened_file_path_; 814 FilePath opened_file_path_;
814 std::string mime_type_; 815 std::string mime_type_;
815 GDataFileType file_type_; 816 GDataFileType file_type_;
(...skipping 1801 matching lines...) Expand 10 before | Expand all | Expand 10 after
2617 2618
2618 // Try to close the same file twice. 2619 // Try to close the same file twice.
2619 file_system_->CloseFile(kFileInRoot, close_file_callback); 2620 file_system_->CloseFile(kFileInRoot, close_file_callback);
2620 message_loop_.Run(); 2621 message_loop_.Run();
2621 2622
2622 // It must fail. 2623 // It must fail.
2623 EXPECT_EQ(GDATA_FILE_ERROR_NOT_FOUND, callback_helper_->last_error_); 2624 EXPECT_EQ(GDATA_FILE_ERROR_NOT_FOUND, callback_helper_->last_error_);
2624 } 2625 }
2625 2626
2626 } // namespace gdata 2627 } // namespace gdata
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/gdata/gdata_file_system_proxy.cc ('k') | chrome/browser/chromeos/gdata/gdata_system_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698