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

Side by Side Diff: chrome/browser/chrome_main_browsertest.cc

Issue 220253002: Add net/base/filename_util.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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/app_controller_mac.mm ('k') | chrome/browser/chrome_plugin_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/process/launch.h" 7 #include "base/process/launch.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_commands.h" 10 #include "chrome/browser/ui/browser_commands.h"
11 #include "chrome/browser/ui/browser_finder.h" 11 #include "chrome/browser/ui/browser_finder.h"
12 #include "chrome/browser/ui/tabs/tab_strip_model.h" 12 #include "chrome/browser/ui/tabs/tab_strip_model.h"
13 #include "chrome/common/chrome_paths.h" 13 #include "chrome/common/chrome_paths.h"
14 #include "chrome/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
15 #include "chrome/test/base/in_process_browser_test.h" 15 #include "chrome/test/base/in_process_browser_test.h"
16 #include "chrome/test/base/test_switches.h" 16 #include "chrome/test/base/test_switches.h"
17 #include "chrome/test/base/ui_test_utils.h" 17 #include "chrome/test/base/ui_test_utils.h"
18 #include "content/public/browser/navigation_controller.h" 18 #include "content/public/browser/navigation_controller.h"
19 #include "content/public/browser/navigation_entry.h" 19 #include "content/public/browser/navigation_entry.h"
20 #include "content/public/browser/notification_service.h" 20 #include "content/public/browser/notification_service.h"
21 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
22 #include "net/base/net_util.h" 22 #include "net/base/filename_util.h"
23 23
24 // These tests don't apply to the Mac version; see GetCommandLineForRelaunch 24 // These tests don't apply to the Mac version; see GetCommandLineForRelaunch
25 // for details. 25 // for details.
26 #if !defined(OS_MACOSX) 26 #if !defined(OS_MACOSX)
27 27
28 class ChromeMainTest : public InProcessBrowserTest { 28 class ChromeMainTest : public InProcessBrowserTest {
29 public: 29 public:
30 ChromeMainTest() {} 30 ChromeMainTest() {}
31 31
32 void Relaunch(const CommandLine& new_command_line) { 32 void Relaunch(const CommandLine& new_command_line) {
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 content::NotificationService::AllSources()); 145 content::NotificationService::AllSources());
146 Relaunch(new_command_line); 146 Relaunch(new_command_line);
147 tab_observer.Wait(); 147 tab_observer.Wait();
148 148
149 // There should be one normal and one incognito window now. 149 // There should be one normal and one incognito window now.
150 ASSERT_EQ(2u, chrome::GetTotalBrowserCount()); 150 ASSERT_EQ(2u, chrome::GetTotalBrowserCount());
151 ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(profile, host_desktop_type)); 151 ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(profile, host_desktop_type));
152 } 152 }
153 153
154 #endif // !OS_MACOSX 154 #endif // !OS_MACOSX
OLDNEW
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/chrome_plugin_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698