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

Side by Side Diff: chrome/browser/chromeos/extensions/file_browser_private_apitest.cc

Issue 11740018: Cleanup: Remove more unneeded browser_thread.h includes. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix cros Created 7 years, 11 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 <stdio.h> 5 #include <stdio.h>
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "chrome/browser/extensions/extension_apitest.h" 8 #include "chrome/browser/extensions/extension_apitest.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/test/base/ui_test_utils.h" 11 #include "chrome/test/base/ui_test_utils.h"
12 #include "chromeos/disks/mock_disk_mount_manager.h" 12 #include "chromeos/disks/mock_disk_mount_manager.h"
13 #include "content/public/browser/browser_context.h" 13 #include "content/public/browser/browser_context.h"
14 #include "content/public/browser/browser_thread.h"
15 #include "content/public/browser/storage_partition.h" 14 #include "content/public/browser/storage_partition.h"
16 #include "webkit/fileapi/file_system_context.h" 15 #include "webkit/fileapi/file_system_context.h"
17 #include "webkit/fileapi/file_system_mount_point_provider.h" 16 #include "webkit/fileapi/file_system_mount_point_provider.h"
18 17
19 using ::testing::_; 18 using ::testing::_;
20 using ::testing::AnyNumber; 19 using ::testing::AnyNumber;
21 using ::testing::ReturnRef; 20 using ::testing::ReturnRef;
22 using ::testing::StrEq; 21 using ::testing::StrEq;
23 using content::BrowserContext; 22 using content::BrowserContext;
24 23
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 kTestDisks[disk_info_index].system_path_prefix, 225 kTestDisks[disk_info_index].system_path_prefix,
227 kTestDisks[disk_info_index].device_type, 226 kTestDisks[disk_info_index].device_type,
228 kTestDisks[disk_info_index].size_in_bytes, 227 kTestDisks[disk_info_index].size_in_bytes,
229 kTestDisks[disk_info_index].is_parent, 228 kTestDisks[disk_info_index].is_parent,
230 kTestDisks[disk_info_index].is_read_only, 229 kTestDisks[disk_info_index].is_read_only,
231 kTestDisks[disk_info_index].has_media, 230 kTestDisks[disk_info_index].has_media,
232 kTestDisks[disk_info_index].on_boot_device, 231 kTestDisks[disk_info_index].on_boot_device,
233 kTestDisks[disk_info_index].is_hidden 232 kTestDisks[disk_info_index].is_hidden
234 ) 233 )
235 )); 234 ));
236
237 } 235 }
238 } 236 }
239 } 237 }
240 238
241 const DiskMountManager::Disk* FindVolumeBySourcePath( 239 const DiskMountManager::Disk* FindVolumeBySourcePath(
242 const std::string& source_path) { 240 const std::string& source_path) {
243 DiskMountManager::DiskMap::const_iterator volume_it = 241 DiskMountManager::DiskMap::const_iterator volume_it =
244 volumes_.find(source_path); 242 volumes_.find(source_path);
245 return (volume_it == volumes_.end()) ? NULL : volume_it->second; 243 return (volume_it == volumes_.end()) ? NULL : volume_it->second;
246 } 244 }
(...skipping 19 matching lines...) Expand all
266 .Times(1); 264 .Times(1);
267 265
268 EXPECT_CALL(*disk_mount_manager_mock_, disks()) 266 EXPECT_CALL(*disk_mount_manager_mock_, disks())
269 .WillRepeatedly(ReturnRef(volumes_)); 267 .WillRepeatedly(ReturnRef(volumes_));
270 268
271 EXPECT_CALL(*disk_mount_manager_mock_, mount_points()) 269 EXPECT_CALL(*disk_mount_manager_mock_, mount_points())
272 .WillRepeatedly(ReturnRef(mount_points_)); 270 .WillRepeatedly(ReturnRef(mount_points_));
273 271
274 ASSERT_TRUE(RunComponentExtensionTest("filebrowser_mount")) << message_; 272 ASSERT_TRUE(RunComponentExtensionTest("filebrowser_mount")) << message_;
275 } 273 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/file_browser_notifications.cc ('k') | chrome/browser/chromeos/login/mock_url_fetchers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698