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

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

Issue 14691006: Move SpawnedTestServer to its own subdirectory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort gyp Created 7 years, 7 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 "base/string_util.h" 5 #include "base/string_util.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "content/public/browser/navigation_controller.h" 7 #include "content/public/browser/navigation_controller.h"
8 #include "content/public/browser/notification_service.h" 8 #include "content/public/browser/notification_service.h"
9 #include "content/public/browser/notification_types.h" 9 #include "content/public/browser/notification_types.h"
10 #include "content/public/browser/web_contents.h" 10 #include "content/public/browser/web_contents.h"
11 #include "content/public/common/url_constants.h" 11 #include "content/public/common/url_constants.h"
12 #include "content/public/test/browser_test_utils.h" 12 #include "content/public/test/browser_test_utils.h"
13 #include "content/public/test/test_utils.h" 13 #include "content/public/test/test_utils.h"
14 #include "content/shell/shell.h" 14 #include "content/shell/shell.h"
15 #include "content/test/content_browser_test.h" 15 #include "content/test/content_browser_test.h"
16 #include "content/test/content_browser_test_utils.h" 16 #include "content/test/content_browser_test_utils.h"
17 #include "net/test/spawned_test_server.h" 17 #include "net/test/spawned_test_server/spawned_test_server.h"
18 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
19 19
20 namespace content { 20 namespace content {
21 21
22 class SessionHistoryTest : public ContentBrowserTest { 22 class SessionHistoryTest : public ContentBrowserTest {
23 protected: 23 protected:
24 SessionHistoryTest() {} 24 SessionHistoryTest() {}
25 25
26 virtual void SetUpOnMainThread() OVERRIDE { 26 virtual void SetUpOnMainThread() OVERRIDE {
27 ASSERT_TRUE(test_server()->Start()); 27 ASSERT_TRUE(test_server()->Start());
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 NavigateToURL(shell(), GetURL("title2.html")); 459 NavigateToURL(shell(), GetURL("title2.html"));
460 460
461 ASSERT_TRUE(ExecuteScriptAndExtractInt( 461 ASSERT_TRUE(ExecuteScriptAndExtractInt(
462 shell()->web_contents(), 462 shell()->web_contents(),
463 "domAutomationController.send(history.length)", 463 "domAutomationController.send(history.length)",
464 &length)); 464 &length));
465 EXPECT_EQ(2, length); 465 EXPECT_EQ(2, length);
466 } 466 }
467 467
468 } // namespace content 468 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698