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

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

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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_client.h" 5 #include "chrome/browser/sync_file_system/drive_file_sync_client.h"
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/message_loop_proxy.h" 9 #include "base/message_loop_proxy.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 sync_client_.reset(); 130 sync_client_.reset();
131 } 131 }
132 132
133 protected: 133 protected:
134 DriveFileSyncClient* sync_client() { return sync_client_.get(); } 134 DriveFileSyncClient* sync_client() { return sync_client_.get(); }
135 135
136 StrictMock<MockDriveService>* mock_drive_service() { 136 StrictMock<MockDriveService>* mock_drive_service() {
137 return mock_drive_service_; 137 return mock_drive_service_;
138 } 138 }
139 139
140 MessageLoop* message_loop() { return &message_loop_; } 140 base::MessageLoop* message_loop() { return &message_loop_; }
141 141
142 private: 142 private:
143 MessageLoop message_loop_; 143 base::MessageLoop message_loop_;
144 144
145 TestingProfile profile_; 145 TestingProfile profile_;
146 scoped_ptr<DriveFileSyncClient> sync_client_; 146 scoped_ptr<DriveFileSyncClient> sync_client_;
147 StrictMock<MockDriveService>* mock_drive_service_; 147 StrictMock<MockDriveService>* mock_drive_service_;
148 FakeDriveUploader* fake_drive_uploader_; 148 FakeDriveUploader* fake_drive_uploader_;
149 149
150 DISALLOW_COPY_AND_ASSIGN(DriveFileSyncClientTest); 150 DISALLOW_COPY_AND_ASSIGN(DriveFileSyncClientTest);
151 }; 151 };
152 152
153 // Invokes |arg0| as a GetAboutResourceCallback. 153 // Invokes |arg0| as a GetAboutResourceCallback.
(...skipping 849 matching lines...) Expand 10 before | Expand all | Expand 10 after
1003 base::Bind(&DidDeleteFile, &done, &error)); 1003 base::Bind(&DidDeleteFile, &done, &error));
1004 message_loop()->RunUntilIdle(); 1004 message_loop()->RunUntilIdle();
1005 1005
1006 EXPECT_TRUE(done); 1006 EXPECT_TRUE(done);
1007 EXPECT_EQ(google_apis::HTTP_CONFLICT, error); 1007 EXPECT_EQ(google_apis::HTTP_CONFLICT, error);
1008 } 1008 }
1009 1009
1010 #endif // !defined(OS_ANDROID) 1010 #endif // !defined(OS_ANDROID)
1011 1011
1012 } // namespace sync_file_system 1012 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698