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

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

Issue 2909011: Disabling BasicRestoreFromClosedWindow for chromeos as well. (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: Created 10 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
« no previous file with comments | « no previous file | no next file » | 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-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #if defined(OS_WIN) 8 #if defined(OS_WIN)
9 #include "base/win_util.h" 9 #include "base/win_util.h"
10 #endif 10 #endif
11 #include "chrome/app/chrome_dll_resource.h" 11 #include "chrome/app/chrome_dll_resource.h"
12 #include "chrome/common/chrome_paths.h" 12 #include "chrome/common/chrome_paths.h"
13 #include "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
16 #include "chrome/test/automation/tab_proxy.h" 16 #include "chrome/test/automation/tab_proxy.h"
17 #include "chrome/test/automation/browser_proxy.h" 17 #include "chrome/test/automation/browser_proxy.h"
18 #include "chrome/test/automation/window_proxy.h" 18 #include "chrome/test/automation/window_proxy.h"
19 #include "chrome/test/ui/ui_test.h" 19 #include "chrome/test/ui/ui_test.h"
20 #include "googleurl/src/gurl.h" 20 #include "googleurl/src/gurl.h"
21 #include "net/base/net_util.h" 21 #include "net/base/net_util.h"
22 #include "net/url_request/url_request_unittest.h" 22 #include "net/url_request/url_request_unittest.h"
23 23
24 // http://code.google.com/p/chromium/issues/detail?id=14774 24 // http://code.google.com/p/chromium/issues/detail?id=14774
25 #if defined(OS_WIN) && !defined(NDEBUG) 25 #if !defined(OS_WIN) && !defined(OS_CHROMEOS) && defined(NDEBUG)
26 #define MAYBE_BasicRestoreFromClosedWindow BasicRestoreFromClosedWindow
27 #else
26 #define MAYBE_BasicRestoreFromClosedWindow DISABLED_BasicRestoreFromClosedWindow 28 #define MAYBE_BasicRestoreFromClosedWindow DISABLED_BasicRestoreFromClosedWindow
27 #else
28 #define MAYBE_BasicRestoreFromClosedWindow BasicRestoreFromClosedWindow
29 #endif 29 #endif
30 30
31 class TabRestoreUITest : public UITest { 31 class TabRestoreUITest : public UITest {
32 public: 32 public:
33 TabRestoreUITest() : UITest() { 33 TabRestoreUITest() : UITest() {
34 FilePath path_prefix(test_data_directory_); 34 FilePath path_prefix(test_data_directory_);
35 path_prefix = path_prefix.AppendASCII("session_history"); 35 path_prefix = path_prefix.AppendASCII("session_history");
36 url1_ = net::FilePathToFileURL(path_prefix.AppendASCII("bot1.html")); 36 url1_ = net::FilePathToFileURL(path_prefix.AppendASCII("bot1.html"));
37 url2_ = net::FilePathToFileURL(path_prefix.AppendASCII("bot2.html")); 37 url2_ = net::FilePathToFileURL(path_prefix.AppendASCII("bot2.html"));
38 } 38 }
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 ASSERT_TRUE(tab->WaitForTabToBeRestored(action_timeout_ms())); 668 ASSERT_TRUE(tab->WaitForTabToBeRestored(action_timeout_ms()));
669 GURL url; 669 GURL url;
670 ASSERT_TRUE(tab->GetCurrentURL(&url)); 670 ASSERT_TRUE(tab->GetCurrentURL(&url));
671 ASSERT_EQ(http_url, url); 671 ASSERT_EQ(http_url, url);
672 672
673 // Go back, and see if content is as expected. 673 // Go back, and see if content is as expected.
674 ASSERT_TRUE(tab->GoBack()); 674 ASSERT_TRUE(tab->GoBack());
675 EXPECT_TRUE(tab->FindInPage(std::wstring(L"webkit"), FWD, IGNORE_CASE, false, 675 EXPECT_TRUE(tab->FindInPage(std::wstring(L"webkit"), FWD, IGNORE_CASE, false,
676 NULL)); 676 NULL));
677 } 677 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698