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

Side by Side Diff: content/browser/tab_contents/navigation_controller_impl_unittest.cc

Issue 9600036: Move Render(View|Widget)Host and associated classes to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to review comments. Created 8 years, 9 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/file_util.h" 5 #include "base/file_util.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 20 matching lines...) Expand all
31 #include "content/test/test_notification_tracker.h" 31 #include "content/test/test_notification_tracker.h"
32 #include "net/base/net_util.h" 32 #include "net/base/net_util.h"
33 #include "testing/gtest/include/gtest/gtest.h" 33 #include "testing/gtest/include/gtest/gtest.h"
34 #include "webkit/glue/webkit_glue.h" 34 #include "webkit/glue/webkit_glue.h"
35 35
36 using base::Time; 36 using base::Time;
37 using content::NavigationController; 37 using content::NavigationController;
38 using content::NavigationEntry; 38 using content::NavigationEntry;
39 using content::NavigationEntryImpl; 39 using content::NavigationEntryImpl;
40 using content::SiteInstance; 40 using content::SiteInstance;
41 using content::TestRenderViewHost;
41 using content::WebContents; 42 using content::WebContents;
42 43
43 // NavigationControllerTest ---------------------------------------------------- 44 // NavigationControllerTest ----------------------------------------------------
44 45
45 class NavigationControllerTest : public RenderViewHostTestHarness { 46 class NavigationControllerTest : public RenderViewHostTestHarness {
46 public: 47 public:
47 NavigationControllerTest() {} 48 NavigationControllerTest() {}
48 49
49 NavigationControllerImpl& controller_impl() { 50 NavigationControllerImpl& controller_impl() {
50 return static_cast<NavigationControllerImpl&>(controller()); 51 return static_cast<NavigationControllerImpl&>(controller());
(...skipping 2522 matching lines...) Expand 10 before | Expand all | Expand 10 after
2573 TabNavigation nav(0, url0, GURL(), string16(), 2574 TabNavigation nav(0, url0, GURL(), string16(),
2574 webkit_glue::CreateHistoryStateForURL(url0), 2575 webkit_glue::CreateHistoryStateForURL(url0),
2575 content::PAGE_TRANSITION_LINK); 2576 content::PAGE_TRANSITION_LINK);
2576 session_helper_.AssertNavigationEquals(nav, 2577 session_helper_.AssertNavigationEquals(nav,
2577 windows_[0]->tabs[0]->navigations[0]); 2578 windows_[0]->tabs[0]->navigations[0]);
2578 nav.set_url(url2); 2579 nav.set_url(url2);
2579 session_helper_.AssertNavigationEquals(nav, 2580 session_helper_.AssertNavigationEquals(nav,
2580 windows_[0]->tabs[0]->navigations[1]); 2581 windows_[0]->tabs[0]->navigations[1]);
2581 } 2582 }
2582 */ 2583 */
OLDNEW
« no previous file with comments | « content/browser/tab_contents/navigation_controller_impl.cc ('k') | content/browser/tab_contents/popup_menu_helper_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698