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

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

Issue 12893: Get rid of kPathSeparator on windows. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years 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/ssl_uitest.cc ('k') | chrome/browser/url_fetcher_unittest.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_util.h" 6 #include "base/file_util.h"
7 #include "base/win_util.h" 7 #include "base/win_util.h"
8 #include "chrome/app/chrome_dll_resource.h" 8 #include "chrome/app/chrome_dll_resource.h"
9 #include "chrome/common/chrome_paths.h" 9 #include "chrome/common/chrome_paths.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
11 #include "chrome/common/pref_names.h" 11 #include "chrome/common/pref_names.h"
12 #include "chrome/test/automation/tab_proxy.h" 12 #include "chrome/test/automation/tab_proxy.h"
13 #include "chrome/test/automation/browser_proxy.h" 13 #include "chrome/test/automation/browser_proxy.h"
14 #include "chrome/test/ui/ui_test.h" 14 #include "chrome/test/ui/ui_test.h"
15 #include "googleurl/src/gurl.h" 15 #include "googleurl/src/gurl.h"
16 #include "net/base/net_util.h" 16 #include "net/base/net_util.h"
17 #include "net/url_request/url_request_unittest.h" 17 #include "net/url_request/url_request_unittest.h"
18 18
19 class TabRestoreUITest : public UITest { 19 class TabRestoreUITest : public UITest {
20 public: 20 public:
21 TabRestoreUITest() : UITest() { 21 TabRestoreUITest() : UITest() {
22 std::wstring path_prefix = test_data_directory_; 22 std::wstring path_prefix = test_data_directory_;
23 file_util::AppendToPath(&path_prefix, L"session_history"); 23 file_util::AppendToPath(&path_prefix, L"session_history");
24 path_prefix += file_util::kPathSeparator; 24 path_prefix += FilePath::kSeparators[0];
25 url1_ = net::FilePathToFileURL(path_prefix + L"bot1.html"); 25 url1_ = net::FilePathToFileURL(path_prefix + L"bot1.html");
26 url2_ = net::FilePathToFileURL(path_prefix + L"bot2.html"); 26 url2_ = net::FilePathToFileURL(path_prefix + L"bot2.html");
27 } 27 }
28 28
29 protected: 29 protected:
30 void RestoreTab() { 30 void RestoreTab() {
31 int tab_count; 31 int tab_count;
32 32
33 // Reset browser_proxy to new window. 33 // Reset browser_proxy to new window.
34 scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); 34 scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 GURL url; 267 GURL url;
268 ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url)); 268 ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url));
269 ASSERT_TRUE(url == url1_); 269 ASSERT_TRUE(url == url1_);
270 270
271 restored_tab_proxy.reset( 271 restored_tab_proxy.reset(
272 browser_proxy->GetTab(initial_tab_count + 1)); 272 browser_proxy->GetTab(initial_tab_count + 1));
273 ASSERT_TRUE(restored_tab_proxy->WaitForTabToBeRestored(kWaitForActionMsec)); 273 ASSERT_TRUE(restored_tab_proxy->WaitForTabToBeRestored(kWaitForActionMsec));
274 ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url)); 274 ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url));
275 ASSERT_TRUE(url == url2_); 275 ASSERT_TRUE(url == url2_);
276 } 276 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl_uitest.cc ('k') | chrome/browser/url_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698