chrome/browser/ui/startup/startup_browser_creator_browsertest.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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/browser/ui/startup/startup_browser_creator.cc ('k') | chrome/browser/ui/startup/startup_browser_creator_impl.cc » ('j') | no next file with comments »

OLD	NEW
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/command_line.h"	5 #include "base/command_line.h"

6 #include "base/file_path.h"	6 #include "base/file_path.h"

	7 #include "base/prefs/pref_service.h"

7 #include "chrome/browser/api/infobars/infobar_service.h"	8 #include "chrome/browser/api/infobars/infobar_service.h"

8 #include "chrome/browser/browser_process.h"	9 #include "chrome/browser/browser_process.h"

9 #include "chrome/browser/extensions/extension_browsertest.h"	10 #include "chrome/browser/extensions/extension_browsertest.h"

10 #include "chrome/browser/extensions/extension_service.h"	11 #include "chrome/browser/extensions/extension_service.h"

11 #include "chrome/browser/extensions/extension_system.h"	12 #include "chrome/browser/extensions/extension_system.h"

12 #include "chrome/browser/first_run/first_run.h"	13 #include "chrome/browser/first_run/first_run.h"

13 #include "chrome/browser/prefs/pref_service.h"

14 #include "chrome/browser/prefs/session_startup_pref.h"	14 #include "chrome/browser/prefs/session_startup_pref.h"

15 #include "chrome/browser/profiles/profile.h"	15 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/browser/profiles/profile_impl.h"	16 #include "chrome/browser/profiles/profile_impl.h"

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

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

19 #include "chrome/browser/ui/browser.h"	19 #include "chrome/browser/ui/browser.h"

20 #include "chrome/browser/ui/browser_finder.h"	20 #include "chrome/browser/ui/browser_finder.h"

21 #include "chrome/browser/ui/browser_list.h"	21 #include "chrome/browser/ui/browser_list.h"

22 #include "chrome/browser/ui/browser_list_observer.h"	22 #include "chrome/browser/ui/browser_list_observer.h"

23 #include "chrome/browser/ui/browser_window.h"	23 #include "chrome/browser/ui/browser_window.h"

(...skipping 850 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
874 new_browser = FindOneOtherBrowserForProfile(profile_urls, NULL);	874 new_browser = FindOneOtherBrowserForProfile(profile_urls, NULL);

875 ASSERT_TRUE(new_browser);	875 ASSERT_TRUE(new_browser);

876 tab_strip = new_browser->tab_strip_model();	876 tab_strip = new_browser->tab_strip_model();

877 ASSERT_EQ(1, tab_strip->count());	877 ASSERT_EQ(1, tab_strip->count());

878 web_contents = tab_strip->GetWebContentsAt(0);	878 web_contents = tab_strip->GetWebContentsAt(0);

879 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), web_contents->GetURL());	879 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), web_contents->GetURL());

880 EXPECT_EQ(1U,	880 EXPECT_EQ(1U,

881 InfoBarService::FromWebContents(web_contents)->GetInfoBarCount());	881 InfoBarService::FromWebContents(web_contents)->GetInfoBarCount());

882 }	882 }

883 #endif // !OS_CHROMEOS	883 #endif // !OS_CHROMEOS

OLD	NEW