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

Side by Side Diff: chrome/browser/sync_file_system/drive/api_util_unittest.cc

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again Created 7 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/api_util.h" 5 #include "chrome/browser/sync_file_system/drive/api_util.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/message_loop_proxy.h" 9 #include "base/message_loop/message_loop_proxy.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 api_util_.reset(); 137 api_util_.reset();
138 } 138 }
139 139
140 protected: 140 protected:
141 APIUtil* api_util() { return api_util_.get(); } 141 APIUtil* api_util() { return api_util_.get(); }
142 142
143 StrictMock<MockDriveService>* mock_drive_service() { 143 StrictMock<MockDriveService>* mock_drive_service() {
144 return mock_drive_service_; 144 return mock_drive_service_;
145 } 145 }
146 146
147 MessageLoop* message_loop() { return &message_loop_; } 147 base::MessageLoop* message_loop() { return &message_loop_; }
148 148
149 private: 149 private:
150 MessageLoop message_loop_; 150 base::MessageLoop message_loop_;
151 151
152 TestingProfile profile_; 152 TestingProfile profile_;
153 scoped_ptr<APIUtil> api_util_; 153 scoped_ptr<APIUtil> api_util_;
154 StrictMock<MockDriveService>* mock_drive_service_; 154 StrictMock<MockDriveService>* mock_drive_service_;
155 FakeDriveUploader* fake_drive_uploader_; 155 FakeDriveUploader* fake_drive_uploader_;
156 156
157 DISALLOW_COPY_AND_ASSIGN(APIUtilTest); 157 DISALLOW_COPY_AND_ASSIGN(APIUtilTest);
158 }; 158 };
159 159
160 // Invokes |arg0| as a GetAboutResourceCallback. 160 // Invokes |arg0| as a GetAboutResourceCallback.
(...skipping 888 matching lines...) Expand 10 before | Expand all | Expand 10 after
1049 1049
1050 EXPECT_TRUE(done); 1050 EXPECT_TRUE(done);
1051 EXPECT_EQ(google_apis::HTTP_SUCCESS, error); 1051 EXPECT_EQ(google_apis::HTTP_SUCCESS, error);
1052 EXPECT_EQ("folder:directory_resource_id", resource_id); 1052 EXPECT_EQ("folder:directory_resource_id", resource_id);
1053 } 1053 }
1054 1054
1055 #endif // !defined(OS_ANDROID) 1055 #endif // !defined(OS_ANDROID)
1056 1056
1057 } // namespace drive 1057 } // namespace drive
1058 } // namespace sync_file_system 1058 } // namespace sync_file_system
OLDNEW
« no previous file with comments | « chrome/browser/sync/test_profile_sync_service.cc ('k') | chrome/browser/sync_file_system/drive/fake_api_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698