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

Side by Side Diff: chrome_frame/test/navigation_test.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
« no previous file with comments | « chrome_frame/test/html_util_unittests.cc ('k') | chrome_frame/test/test_with_web_server.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <string> 5 #include <string>
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/test/test_file_util.h" 8 #include "base/test/test_file_util.h"
9 #include "base/win/scoped_comptr.h" 9 #include "base/win/scoped_comptr.h"
10 #include "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
864 864
865 EXPECT_CALL(save_dialog_watcher, OnWindowClose(_)) 865 EXPECT_CALL(save_dialog_watcher, OnWindowClose(_))
866 .WillOnce(testing::DoAll( 866 .WillOnce(testing::DoAll(
867 WaitForFileSave(temp_file_path, 3000), 867 WaitForFileSave(temp_file_path, 3000),
868 testing::InvokeWithoutArgs( 868 testing::InvokeWithoutArgs(
869 testing::CreateFunctor(CloseWindow, &owner_window)), 869 testing::CreateFunctor(CloseWindow, &owner_window)),
870 CloseBrowserMock(&ie_mock_))); 870 CloseBrowserMock(&ie_mock_)));
871 LaunchIENavigateAndLoop(src_url, kChromeFrameVeryLongNavigationTimeout); 871 LaunchIENavigateAndLoop(src_url, kChromeFrameVeryLongNavigationTimeout);
872 872
873 std::string data; 873 std::string data;
874 EXPECT_TRUE(file_util::ReadFileToString(temp_file_path, &data)); 874 EXPECT_TRUE(base::ReadFileToString(temp_file_path, &data));
875 EXPECT_EQ("hello", data); 875 EXPECT_EQ("hello", data);
876 file_util::DieFileDie(temp_file_path, false); 876 file_util::DieFileDie(temp_file_path, false);
877 } 877 }
878 878
879 // Test fixture for testing if http header works for supported content types 879 // Test fixture for testing if http header works for supported content types
880 class HttpHeaderTest : public MockIEEventSinkTest, public testing::Test { 880 class HttpHeaderTest : public MockIEEventSinkTest, public testing::Test {
881 public: 881 public:
882 HttpHeaderTest() {} 882 HttpHeaderTest() {}
883 883
884 void HeaderTestWithData(const char* content_type, const char* data) { 884 void HeaderTestWithData(const char* content_type, const char* data) {
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
1290 .WillOnce(CloseBrowserMock( 1290 .WillOnce(CloseBrowserMock(
1291 &no_referrer_target_opener_window_mock)); 1291 &no_referrer_target_opener_window_mock));
1292 1292
1293 EXPECT_CALL(no_referrer_target_opener_window_mock, OnQuit()) 1293 EXPECT_CALL(no_referrer_target_opener_window_mock, OnQuit())
1294 .WillOnce(CloseBrowserMock(&ie_mock_)); 1294 .WillOnce(CloseBrowserMock(&ie_mock_));
1295 1295
1296 LaunchIENavigateAndLoop(initial_url, kChromeFrameVeryLongNavigationTimeout); 1296 LaunchIENavigateAndLoop(initial_url, kChromeFrameVeryLongNavigationTimeout);
1297 } 1297 }
1298 1298
1299 } // namespace chrome_frame_test 1299 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « chrome_frame/test/html_util_unittests.cc ('k') | chrome_frame/test/test_with_web_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698