diff options
| -rw-r--r-- | chrome/browser/browser_process_impl.h | 1 | ||||
| -rw-r--r-- | chrome/browser/find_in_page_controller_uitest.cc | 3 | ||||
| -rw-r--r-- | chrome/test/accessibility/constants.h | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index 5cfc375..82f275f 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -176,7 +176,6 @@ 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 c37870b..0fd4012 100644 --- a/chrome/browser/find_in_page_controller_uitest.cc +++ b/chrome/browser/find_in_page_controller_uitest.cc @@ -129,8 +129,7 @@ TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) { scoped_ptr<TabProxy> tabA(GetActiveTab()); ASSERT_TRUE(tabA->NavigateToURL(url)); - scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); - //scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow()); + scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow()); ASSERT_TRUE(browser.get() != NULL); // Toggle the bookmark bar state. diff --git a/chrome/test/accessibility/constants.h b/chrome/test/accessibility/constants.h index 7a0871f..b265e4b 100644 --- a/chrome/test/accessibility/constants.h +++ b/chrome/test/accessibility/constants.h @@ -8,8 +8,6 @@ #include <windows.h> #include <tchar.h> -#define NEW_FRAMES - /////////////////////////////////////////////////////////////////// // Constant Definitations specific to Chrome Accessibility Tests. /////////////////////////////////////////////////////////////////// |