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

Side by Side Diff: chrome/browser/sessions/session_restore_browsertest.cc

Issue 19631004: Update include paths in chrome/browser/ for base/process changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge ToT Created 7 years, 5 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/process/launch.h"
7 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
8 #include "base/time/time.h" 9 #include "base/time/time.h"
9 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/chrome_notification_types.h" 11 #include "chrome/browser/chrome_notification_types.h"
11 #include "chrome/browser/defaults.h" 12 #include "chrome/browser/defaults.h"
12 #include "chrome/browser/first_run/first_run.h" 13 #include "chrome/browser/first_run/first_run.h"
13 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
15 #include "chrome/browser/sessions/session_restore.h" 16 #include "chrome/browser/sessions/session_restore.h"
16 #include "chrome/browser/sessions/session_service.h" 17 #include "chrome/browser/sessions/session_service.h"
(...skipping 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1128 content::NavigationController* controller = 1129 content::NavigationController* controller =
1129 &browser()->tab_strip_model()->GetActiveWebContents()->GetController(); 1130 &browser()->tab_strip_model()->GetActiveWebContents()->GetController();
1130 EXPECT_TRUE( 1131 EXPECT_TRUE(
1131 controller->GetDefaultSessionStorageNamespace()->should_persist()); 1132 controller->GetDefaultSessionStorageNamespace()->should_persist());
1132 1133
1133 // Quit and restore. Check that no extra tabs were created. 1134 // Quit and restore. Check that no extra tabs were created.
1134 Browser* new_browser = QuitBrowserAndRestore(browser(), 1); 1135 Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
1135 ASSERT_EQ(1u, active_browser_list_->size()); 1136 ASSERT_EQ(1u, active_browser_list_->size());
1136 EXPECT_EQ(1, new_browser->tab_strip_model()->count()); 1137 EXPECT_EQ(1, new_browser->tab_strip_model()->count());
1137 } 1138 }
OLDNEW
« no previous file with comments | « chrome/browser/service/service_process_control_browsertest.cc ('k') | chrome/browser/shell_integration_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698