content/browser/tab_contents/navigation_controller_unittest.cc - Issue 7541001: Move more files from chrome/test to chrome/test/base, part #3

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

Issue 7541001: Move more files from chrome/test to chrome/test/base, part #3 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 4 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

« no previous file with comments | « chrome/test/values_test_util.cc ('k') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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"

11 // These are only used for commented out tests. If someone wants to enable	11 // These are only used for commented out tests. If someone wants to enable

12 // them, they should be moved to chrome first.	12 // them, they should be moved to chrome first.

13 // #include "chrome/browser/history/history.h"	13 // #include "chrome/browser/history/history.h"

14 // #include "chrome/browser/profiles/profile_manager.h"	14 // #include "chrome/browser/profiles/profile_manager.h"

15 // #include "chrome/browser/sessions/session_service.h"	15 // #include "chrome/browser/sessions/session_service.h"

16 // #include "chrome/browser/sessions/session_service_factory.h"	16 // #include "chrome/browser/sessions/session_service_factory.h"

17 // #include "chrome/browser/sessions/session_service_test_helper.h"	17 // #include "chrome/browser/sessions/session_service_test_helper.h"

18 // #include "chrome/browser/sessions/session_types.h"	18 // #include "chrome/browser/sessions/session_types.h"

19 #include "chrome/test/test_notification_tracker.h"	19 #include "chrome/test/base/test_notification_tracker.h"

20 #include "chrome/test/testing_profile.h"	20 #include "chrome/test/testing_profile.h"

21 #include "content/browser/renderer_host/test_render_view_host.h"	21 #include "content/browser/renderer_host/test_render_view_host.h"

22 #include "content/browser/site_instance.h"	22 #include "content/browser/site_instance.h"

23 #include "content/browser/tab_contents/navigation_controller.h"	23 #include "content/browser/tab_contents/navigation_controller.h"

24 #include "content/browser/tab_contents/navigation_details.h"	24 #include "content/browser/tab_contents/navigation_details.h"

25 #include "content/browser/tab_contents/navigation_entry.h"	25 #include "content/browser/tab_contents/navigation_entry.h"

26 #include "content/browser/tab_contents/tab_contents.h"	26 #include "content/browser/tab_contents/tab_contents.h"

27 #include "content/browser/tab_contents/tab_contents_delegate.h"	27 #include "content/browser/tab_contents/tab_contents_delegate.h"

28 #include "content/browser/tab_contents/test_tab_contents.h"	28 #include "content/browser/tab_contents/test_tab_contents.h"

29 #include "content/common/notification_registrar.h"	29 #include "content/common/notification_registrar.h"

(...skipping 2257 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2287 TabNavigation nav(0, url0, GURL(), string16(),	2287 TabNavigation nav(0, url0, GURL(), string16(),

2288 webkit_glue::CreateHistoryStateForURL(url0),	2288 webkit_glue::CreateHistoryStateForURL(url0),

2289 PageTransition::LINK);	2289 PageTransition::LINK);

2290 session_helper_.AssertNavigationEquals(nav,	2290 session_helper_.AssertNavigationEquals(nav,

2291 windows_[0]->tabs[0]->navigations[0]);	2291 windows_[0]->tabs[0]->navigations[0]);

2292 nav.set_url(url2);	2292 nav.set_url(url2);

2293 session_helper_.AssertNavigationEquals(nav,	2293 session_helper_.AssertNavigationEquals(nav,

2294 windows_[0]->tabs[0]->navigations[1]);	2294 windows_[0]->tabs[0]->navigations[1]);

2295 }	2295 }

2296 */	2296 */

OLD	NEW