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

Side by Side Diff: content/browser/web_contents/web_contents_impl_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/values.h" 5 #include "base/values.h"
6 #include "content/browser/web_contents/web_contents_impl.h" 6 #include "content/browser/web_contents/web_contents_impl.h"
7 #include "content/public/browser/load_notification_details.h" 7 #include "content/public/browser/load_notification_details.h"
8 #include "content/public/browser/navigation_controller.h" 8 #include "content/public/browser/navigation_controller.h"
9 #include "content/public/browser/notification_details.h" 9 #include "content/public/browser/notification_details.h"
10 #include "content/public/browser/notification_observer.h" 10 #include "content/public/browser/notification_observer.h"
11 #include "content/public/browser/notification_types.h" 11 #include "content/public/browser/notification_types.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 18
19 namespace content { 19 namespace content {
20 20
21 class WebContentsImplBrowserTest : public ContentBrowserTest { 21 class WebContentsImplBrowserTest : public ContentBrowserTest {
22 public: 22 public:
23 WebContentsImplBrowserTest() {} 23 WebContentsImplBrowserTest() {}
24 24
25 private: 25 private:
26 DISALLOW_COPY_AND_ASSIGN(WebContentsImplBrowserTest); 26 DISALLOW_COPY_AND_ASSIGN(WebContentsImplBrowserTest);
27 }; 27 };
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 commit_observer.Wait(); 115 commit_observer.Wait();
116 load_observer.Wait(); 116 load_observer.Wait();
117 117
118 EXPECT_EQ("/files/title1.html", load_observer.url_.path()); 118 EXPECT_EQ("/files/title1.html", load_observer.url_.path());
119 EXPECT_EQ(0, load_observer.session_index_); 119 EXPECT_EQ(0, load_observer.session_index_);
120 EXPECT_EQ(&shell()->web_contents()->GetController(), 120 EXPECT_EQ(&shell()->web_contents()->GetController(),
121 load_observer.controller_); 121 load_observer.controller_);
122 } 122 }
123 123
124 } // namespace content 124 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/session_history_browsertest.cc ('k') | content/browser/worker_host/test/worker_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698