summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-14 21:53:58 +0000
committerbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-14 21:53:58 +0000
commit7bb9eb3fe659f6e04f98fc3cb22745cdd0ce62a6 (patch)
tree93205b06875ab11ea54100b84862677b25dbf058 /chrome/browser
parent36be2f94e6b1d6ef3b1f8ee6c638a4f929f506d0 (diff)
downloadchromium_src-7bb9eb3fe659f6e04f98fc3cb22745cdd0ce62a6.zip
chromium_src-7bb9eb3fe659f6e04f98fc3cb22745cdd0ce62a6.tar.gz
chromium_src-7bb9eb3fe659f6e04f98fc3cb22745cdd0ce62a6.tar.bz2
Yet another test, this time with a tweak to the find test.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2207 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser_process_impl.h1
-rw-r--r--chrome/browser/find_in_page_controller_uitest.cc3
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 82f275f..5cfc375 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -176,6 +176,7 @@ class BrowserProcessImpl : public BrowserProcess, public NonThreadSafe {
// TODO(beng): remove once XPFrame/VistaFrame are gone.
virtual bool IsUsingNewFrames() {
DCHECK(CalledOnValidThread());
+ return true;
if (!checked_for_new_frames_) {
using_new_frames_ = CommandLine().HasSwitch(L"magic_browzR");
checked_for_new_frames_ = true;
diff --git a/chrome/browser/find_in_page_controller_uitest.cc b/chrome/browser/find_in_page_controller_uitest.cc
index 0fd4012..c37870b 100644
--- a/chrome/browser/find_in_page_controller_uitest.cc
+++ b/chrome/browser/find_in_page_controller_uitest.cc
@@ -129,7 +129,8 @@ TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) {
scoped_ptr<TabProxy> tabA(GetActiveTab());
ASSERT_TRUE(tabA->NavigateToURL(url));
- scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow());
+ scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+ //scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow());
ASSERT_TRUE(browser.get() != NULL);
// Toggle the bookmark bar state.