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

Side by Side Diff: chrome/test/automation/automation_proxy_uitest.cc

Issue 9372065: Update clients to use new TestServer constructor. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Remove files that were reviewed and committed separately. Created 8 years, 10 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
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/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
1047 EXPECT_CALL(*mock_, HandleClosed(1)).Times(1); 1047 EXPECT_CALL(*mock_, HandleClosed(1)).Times(1);
1048 1048
1049 tab = mock_->CreateTabWithUrl(GURL(content)); 1049 tab = mock_->CreateTabWithUrl(GURL(content));
1050 loop.RunFor(TestTimeouts::action_max_timeout_ms()); 1050 loop.RunFor(TestTimeouts::action_max_timeout_ms());
1051 } 1051 }
1052 1052
1053 // Flaky: http://crbug.com/62143 1053 // Flaky: http://crbug.com/62143
1054 TEST_F(ExternalTabUITest, DISABLED_PostMessageTarget) { 1054 TEST_F(ExternalTabUITest, DISABLED_PostMessageTarget) {
1055 net::TestServer test_server( 1055 net::TestServer test_server(
1056 net::TestServer::TYPE_HTTP, 1056 net::TestServer::TYPE_HTTP,
1057 net::TestServer::kLocalhost,
1057 FilePath(FILE_PATH_LITERAL("chrome/test/data/external_tab"))); 1058 FilePath(FILE_PATH_LITERAL("chrome/test/data/external_tab")));
1058 ASSERT_TRUE(test_server.Start()); 1059 ASSERT_TRUE(test_server.Start());
1059 1060
1060 scoped_refptr<TabProxy> tab; 1061 scoped_refptr<TabProxy> tab;
1061 TimedMessageLoopRunner loop(MessageLoop::current()); 1062 TimedMessageLoopRunner loop(MessageLoop::current());
1062 ASSERT_THAT(mock_, testing::NotNull()); 1063 ASSERT_THAT(mock_, testing::NotNull());
1063 EXPECT_CALL(*mock_, OnNavigationStateChanged(_, _)) 1064 EXPECT_CALL(*mock_, OnNavigationStateChanged(_, _))
1064 .Times(testing::AnyNumber()); 1065 .Times(testing::AnyNumber());
1065 EXPECT_CALL(*mock_, OnLoad(_)).Times(testing::AnyNumber()); 1066 EXPECT_CALL(*mock_, OnLoad(_)).Times(testing::AnyNumber());
1066 1067
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
1580 1581
1581 std::string data; 1582 std::string data;
1582 ASSERT_NO_FATAL_FAILURE(AssertReadPNG(snapshot_path_, &data)); 1583 ASSERT_NO_FATAL_FAILURE(AssertReadPNG(snapshot_path_, &data));
1583 EXPECT_STREQ(kReferenceMd5, base::MD5String(data).c_str()); 1584 EXPECT_STREQ(kReferenceMd5, base::MD5String(data).c_str());
1584 if (CommandLine::ForCurrentProcess()->HasSwitch("dump-test-image")) { 1585 if (CommandLine::ForCurrentProcess()->HasSwitch("dump-test-image")) {
1585 FilePath path(FILE_PATH_LITERAL("snapshot.png")); 1586 FilePath path(FILE_PATH_LITERAL("snapshot.png"));
1586 EXPECT_EQ(file_util::WriteFile(path, &data[0], data.length()), 1587 EXPECT_EQ(file_util::WriteFile(path, &data[0], data.length()),
1587 static_cast<int>(data.length())); 1588 static_cast<int>(data.length()));
1588 } 1589 }
1589 } 1590 }
OLDNEW
« no previous file with comments | « chrome/renderer/loadtimes_extension_bindings_uitest.cc ('k') | chrome/test/base/in_process_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698