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

Side by Side Diff: chrome/browser/extensions/api/downloads/downloads_api_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) 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 <algorithm> 5 #include <algorithm>
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 2179 matching lines...) Expand 10 before | Expand all | Expand 10 after
2190 " \"current\": \"%s\"}}]", 2190 " \"current\": \"%s\"}}]",
2191 result_id, 2191 result_id,
2192 GetFilename("on_record.txt").c_str()))); 2192 GetFilename("on_record.txt").c_str())));
2193 ASSERT_TRUE(WaitFor(api::OnChanged::kEventName, 2193 ASSERT_TRUE(WaitFor(api::OnChanged::kEventName,
2194 base::StringPrintf("[{\"id\": %d," 2194 base::StringPrintf("[{\"id\": %d,"
2195 " \"state\": {" 2195 " \"state\": {"
2196 " \"previous\": \"in_progress\"," 2196 " \"previous\": \"in_progress\","
2197 " \"current\": \"complete\"}}]", 2197 " \"current\": \"complete\"}}]",
2198 result_id))); 2198 result_id)));
2199 std::string disk_data; 2199 std::string disk_data;
2200 EXPECT_TRUE(file_util::ReadFileToString(item->GetTargetFilePath(), 2200 EXPECT_TRUE(base::ReadFileToString(item->GetTargetFilePath(), &disk_data));
2201 &disk_data));
2202 EXPECT_STREQ(kPayloadData, disk_data.c_str()); 2201 EXPECT_STREQ(kPayloadData, disk_data.c_str());
2203 } 2202 }
2204 2203
2205 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, 2204 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
2206 DownloadExtensionTest_OnDeterminingFilename_NoChange) { 2205 DownloadExtensionTest_OnDeterminingFilename_NoChange) {
2207 GoOnTheRecord(); 2206 GoOnTheRecord();
2208 LoadExtension("downloads_split"); 2207 LoadExtension("downloads_split");
2209 AddFilenameDeterminer(); 2208 AddFilenameDeterminer();
2210 ASSERT_TRUE(StartEmbeddedTestServer()); 2209 ASSERT_TRUE(StartEmbeddedTestServer());
2211 ASSERT_TRUE(test_server()->Start()); 2210 ASSERT_TRUE(test_server()->Start());
(...skipping 1385 matching lines...) Expand 10 before | Expand all | Expand 10 after
3597 &conflict_action, 3596 &conflict_action,
3598 &warnings); 3597 &warnings);
3599 EXPECT_EQ("suggester", winner_id); 3598 EXPECT_EQ("suggester", winner_id);
3600 EXPECT_EQ(FILE_PATH_LITERAL("b"), filename.value()); 3599 EXPECT_EQ(FILE_PATH_LITERAL("b"), filename.value());
3601 EXPECT_EQ(api::FILENAME_CONFLICT_ACTION_PROMPT, conflict_action); 3600 EXPECT_EQ(api::FILENAME_CONFLICT_ACTION_PROMPT, conflict_action);
3602 EXPECT_FALSE(warnings.empty()); 3601 EXPECT_FALSE(warnings.empty());
3603 EXPECT_EQ(extensions::ExtensionWarning::kDownloadFilenameConflict, 3602 EXPECT_EQ(extensions::ExtensionWarning::kDownloadFilenameConflict,
3604 warnings.begin()->warning_type()); 3603 warnings.begin()->warning_type());
3605 EXPECT_EQ("incumbent", warnings.begin()->extension_id()); 3604 EXPECT_EQ("incumbent", warnings.begin()->extension_id());
3606 } 3605 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698