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

Side by Side Diff: chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc

Issue 19579005: Move ReadFileToString to the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 // Browser test for basic Chrome OS file manager functionality: 5 // Browser test for basic Chrome OS file manager functionality:
6 // - The file list is updated when a file is added externally to the Downloads 6 // - The file list is updated when a file is added externally to the Downloads
7 // folder. 7 // folder.
8 // - Selecting a file and copy-pasting it with the keyboard copies the file. 8 // - Selecting a file and copy-pasting it with the keyboard copies the file.
9 // - Selecting a file and pressing delete deletes it. 9 // - Selecting a file and pressing delete deletes it.
10 10
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 const std::string& mime_type, 243 const std::string& mime_type,
244 bool shared_with_me, 244 bool shared_with_me,
245 const base::Time& modification_time) { 245 const base::Time& modification_time) {
246 google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR; 246 google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
247 247
248 std::string content_data; 248 std::string content_data;
249 if (!source_file_name.empty()) { 249 if (!source_file_name.empty()) {
250 base::FilePath source_file_path = 250 base::FilePath source_file_path =
251 google_apis::test_util::GetTestFilePath("chromeos/file_manager"). 251 google_apis::test_util::GetTestFilePath("chromeos/file_manager").
252 AppendASCII(source_file_name); 252 AppendASCII(source_file_name);
253 ASSERT_TRUE(file_util::ReadFileToString(source_file_path, &content_data)); 253 ASSERT_TRUE(base::ReadFileToString(source_file_path, &content_data));
254 } 254 }
255 255
256 scoped_ptr<google_apis::ResourceEntry> resource_entry; 256 scoped_ptr<google_apis::ResourceEntry> resource_entry;
257 fake_drive_service_->AddNewFile( 257 fake_drive_service_->AddNewFile(
258 mime_type, 258 mime_type,
259 content_data, 259 content_data,
260 fake_drive_service_->GetRootResourceId(), 260 fake_drive_service_->GetRootResourceId(),
261 target_file_name, 261 target_file_name,
262 shared_with_me, 262 shared_with_me,
263 google_apis::test_util::CreateCopyResultCallback(&error, 263 google_apis::test_util::CreateCopyResultCallback(&error,
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 TestParameter(NOT_IN_GUEST_MODE, "shareDirectory"))); 575 TestParameter(NOT_IN_GUEST_MODE, "shareDirectory")));
576 576
577 INSTANTIATE_TEST_CASE_P( 577 INSTANTIATE_TEST_CASE_P(
578 restoreGeometry, 578 restoreGeometry,
579 FileManagerBrowserTest, 579 FileManagerBrowserTest,
580 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "restoreGeometry"), 580 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "restoreGeometry"),
581 TestParameter(IN_GUEST_MODE, "restoreGeometry"))); 581 TestParameter(IN_GUEST_MODE, "restoreGeometry")));
582 582
583 } // namespace 583 } // namespace
584 } // namespace file_manager 584 } // namespace file_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698