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

Side by Side Diff: chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc

Issue 365583003: [fsp] Remove weak pointers from loggers wherever possible. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
« no previous file with comments | « chrome/browser/chromeos/file_system_provider/operations/unmount_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 // TODO(mtomasz): Move these test cases to operations/unmount_unittest.cc. 5 // TODO(mtomasz): Move these test cases to operations/unmount_unittest.cc.
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/files/file.h" 10 #include "base/files/file.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 private: 51 private:
52 std::string extension_id_; 52 std::string extension_id_;
53 scoped_ptr<extensions::Event> event_; 53 scoped_ptr<extensions::Event> event_;
54 54
55 DISALLOW_COPY_AND_ASSIGN(FakeEventRouter); 55 DISALLOW_COPY_AND_ASSIGN(FakeEventRouter);
56 }; 56 };
57 57
58 class EventLogger { 58 class EventLogger {
59 public: 59 public:
60 EventLogger() : weak_ptr_factory_(this) {} 60 EventLogger() {}
61 virtual ~EventLogger() {} 61 virtual ~EventLogger() {}
62 62
63 void OnStatusCallback(base::File::Error error) { 63 void OnStatusCallback(base::File::Error error) {
64 error_.reset(new base::File::Error(error)); 64 error_.reset(new base::File::Error(error));
65 } 65 }
66 66
67 base::File::Error* error() { return error_.get(); } 67 base::File::Error* error() { return error_.get(); }
68 68
69 base::WeakPtr<EventLogger> GetWeakPtr() {
70 return weak_ptr_factory_.GetWeakPtr();
71 }
72
73 private: 69 private:
74 scoped_ptr<base::File::Error> error_; 70 scoped_ptr<base::File::Error> error_;
75
76 base::WeakPtrFactory<EventLogger> weak_ptr_factory_;
77 DISALLOW_COPY_AND_ASSIGN(EventLogger); 71 DISALLOW_COPY_AND_ASSIGN(EventLogger);
78 }; 72 };
79 73
80 } // namespace 74 } // namespace
81 75
82 class FileSystemProviderProvidedFileSystemTest : public testing::Test { 76 class FileSystemProviderProvidedFileSystemTest : public testing::Test {
83 protected: 77 protected:
84 FileSystemProviderProvidedFileSystemTest() {} 78 FileSystemProviderProvidedFileSystemTest() {}
85 virtual ~FileSystemProviderProvidedFileSystemTest() {} 79 virtual ~FileSystemProviderProvidedFileSystemTest() {}
86 80
(...skipping 17 matching lines...) Expand all
104 scoped_ptr<TestingProfile> profile_; 98 scoped_ptr<TestingProfile> profile_;
105 scoped_ptr<FakeEventRouter> event_router_; 99 scoped_ptr<FakeEventRouter> event_router_;
106 scoped_ptr<ProvidedFileSystemInfo> file_system_info_; 100 scoped_ptr<ProvidedFileSystemInfo> file_system_info_;
107 scoped_ptr<ProvidedFileSystemInterface> provided_file_system_; 101 scoped_ptr<ProvidedFileSystemInterface> provided_file_system_;
108 }; 102 };
109 103
110 TEST_F(FileSystemProviderProvidedFileSystemTest, RequestUnmount_Success) { 104 TEST_F(FileSystemProviderProvidedFileSystemTest, RequestUnmount_Success) {
111 EventLogger logger; 105 EventLogger logger;
112 106
113 provided_file_system_->RequestUnmount( 107 provided_file_system_->RequestUnmount(
114 base::Bind(&EventLogger::OnStatusCallback, logger.GetWeakPtr())); 108 base::Bind(&EventLogger::OnStatusCallback, base::Unretained(logger)));
115 base::RunLoop().RunUntilIdle(); 109 base::RunLoop().RunUntilIdle();
116 110
117 // Verify that the event has been sent to the providing extension. 111 // Verify that the event has been sent to the providing extension.
118 EXPECT_EQ(kExtensionId, event_router_->extension_id()); 112 EXPECT_EQ(kExtensionId, event_router_->extension_id());
119 const extensions::Event* event = event_router_->event(); 113 const extensions::Event* event = event_router_->event();
120 ASSERT_TRUE(event); 114 ASSERT_TRUE(event);
121 ASSERT_TRUE(event->event_args); 115 ASSERT_TRUE(event->event_args);
122 base::ListValue* event_args = event->event_args.get(); 116 base::ListValue* event_args = event->event_args.get();
123 EXPECT_EQ(2u, event_args->GetSize()); 117 EXPECT_EQ(2u, event_args->GetSize());
124 std::string file_system_id; 118 std::string file_system_id;
(...skipping 18 matching lines...) Expand all
143 137
144 // Callback should be called. Verify the error code. 138 // Callback should be called. Verify the error code.
145 ASSERT_TRUE(logger.error()); 139 ASSERT_TRUE(logger.error());
146 EXPECT_EQ(base::File::FILE_OK, *logger.error()); 140 EXPECT_EQ(base::File::FILE_OK, *logger.error());
147 } 141 }
148 142
149 TEST_F(FileSystemProviderProvidedFileSystemTest, RequestUnmount_Error) { 143 TEST_F(FileSystemProviderProvidedFileSystemTest, RequestUnmount_Error) {
150 EventLogger logger; 144 EventLogger logger;
151 145
152 provided_file_system_->RequestUnmount( 146 provided_file_system_->RequestUnmount(
153 base::Bind(&EventLogger::OnStatusCallback, logger.GetWeakPtr())); 147 base::Bind(&EventLogger::OnStatusCallback, base::Unretained(logger)));
154 base::RunLoop().RunUntilIdle(); 148 base::RunLoop().RunUntilIdle();
155 149
156 // Verify that the event has been sent to the providing extension. 150 // Verify that the event has been sent to the providing extension.
157 EXPECT_EQ(kExtensionId, event_router_->extension_id()); 151 EXPECT_EQ(kExtensionId, event_router_->extension_id());
158 const extensions::Event* event = event_router_->event(); 152 const extensions::Event* event = event_router_->event();
159 ASSERT_TRUE(event); 153 ASSERT_TRUE(event);
160 ASSERT_TRUE(event->event_args); 154 ASSERT_TRUE(event->event_args);
161 base::ListValue* event_args = event->event_args.get(); 155 base::ListValue* event_args = event->event_args.get();
162 EXPECT_EQ(2u, event_args->GetSize()); 156 EXPECT_EQ(2u, event_args->GetSize());
163 std::string file_system_id; 157 std::string file_system_id;
(...skipping 12 matching lines...) Expand all
176 request_id, base::File::FILE_ERROR_NOT_FOUND); 170 request_id, base::File::FILE_ERROR_NOT_FOUND);
177 EXPECT_TRUE(reply_result); 171 EXPECT_TRUE(reply_result);
178 172
179 // Callback should be called. Verify the error code. 173 // Callback should be called. Verify the error code.
180 ASSERT_TRUE(logger.error()); 174 ASSERT_TRUE(logger.error());
181 EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, *logger.error()); 175 EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, *logger.error());
182 } 176 }
183 177
184 } // namespace file_system_provider 178 } // namespace file_system_provider
185 } // namespace chromeos 179 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/file_system_provider/operations/unmount_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698