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

Side by Side Diff: content/browser/session_history_browsertest.cc

Issue 637183002: Replace FINAL and OVERRIDE with their C++11 counterparts in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch Created 6 years, 2 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 "base/strings/string_util.h" 5 #include "base/strings/string_util.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/public/browser/navigation_controller.h" 8 #include "content/public/browser/navigation_controller.h"
9 #include "content/public/browser/notification_service.h" 9 #include "content/public/browser/notification_service.h"
10 #include "content/public/browser/notification_types.h" 10 #include "content/public/browser/notification_types.h"
(...skipping 29 matching lines...) Expand all
40 request.content.c_str())); 40 request.content.c_str()));
41 return http_response.PassAs<net::test_server::HttpResponse>(); 41 return http_response.PassAs<net::test_server::HttpResponse>();
42 } 42 }
43 43
44 } // namespace 44 } // namespace
45 45
46 class SessionHistoryTest : public ContentBrowserTest { 46 class SessionHistoryTest : public ContentBrowserTest {
47 protected: 47 protected:
48 SessionHistoryTest() {} 48 SessionHistoryTest() {}
49 49
50 virtual void SetUpOnMainThread() OVERRIDE { 50 virtual void SetUpOnMainThread() override {
51 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 51 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
52 embedded_test_server()->RegisterRequestHandler( 52 embedded_test_server()->RegisterRequestHandler(
53 base::Bind(&HandleEchoTitleRequest, "/echotitle")); 53 base::Bind(&HandleEchoTitleRequest, "/echotitle"));
54 54
55 NavigateToURL(shell(), GURL(url::kAboutBlankURL)); 55 NavigateToURL(shell(), GURL(url::kAboutBlankURL));
56 } 56 }
57 57
58 // Simulate clicking a link. Only works on the frames.html testserver page. 58 // Simulate clicking a link. Only works on the frames.html testserver page.
59 void ClickLink(std::string node_id) { 59 void ClickLink(std::string node_id) {
60 GURL url("javascript:clickLink('" + node_id + "')"); 60 GURL url("javascript:clickLink('" + node_id + "')");
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 NavigateToURL(shell(), GetURL("title2.html")); 490 NavigateToURL(shell(), GetURL("title2.html"));
491 491
492 ASSERT_TRUE(ExecuteScriptAndExtractInt( 492 ASSERT_TRUE(ExecuteScriptAndExtractInt(
493 shell()->web_contents(), 493 shell()->web_contents(),
494 "domAutomationController.send(history.length)", 494 "domAutomationController.send(history.length)",
495 &length)); 495 &length));
496 EXPECT_EQ(2, length); 496 EXPECT_EQ(2, length);
497 } 497 }
498 498
499 } // namespace content 499 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698