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

Unified Diff: content/browser/in_process_webkit/indexed_db_browsertest.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/fileapi/file_system_browsertest.cc ('k') | content/browser/media_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/in_process_webkit/indexed_db_browsertest.cc
===================================================================
--- content/browser/in_process_webkit/indexed_db_browsertest.cc (revision 145001)
+++ content/browser/in_process_webkit/indexed_db_browsertest.cc (working copy)
@@ -12,6 +12,7 @@
#include "base/test/thread_test_helper.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/ui_test_utils.h"
@@ -54,11 +55,12 @@
ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
the_browser, test_url, 2);
LOG(INFO) << "Navigation done.";
- std::string result = the_browser->GetActiveWebContents()->GetURL().ref();
+ std::string result =
+ chrome::GetActiveWebContents(the_browser)->GetURL().ref();
if (result != "pass") {
std::string js_result;
ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
- the_browser->GetActiveWebContents()->GetRenderViewHost(), L"",
+ chrome::GetActiveWebContents(the_browser)->GetRenderViewHost(), L"",
L"window.domAutomationController.send(getLog())", &js_result));
FAIL() << "Failed: " << js_result;
}
@@ -115,7 +117,7 @@
IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DoesntHangTest) {
SimpleTest(GetTestURL(FilePath(
FILE_PATH_LITERAL("transaction_run_forever.html"))));
- ui_test_utils::CrashTab(browser()->GetActiveWebContents());
+ ui_test_utils::CrashTab(chrome::GetActiveWebContents(browser()));
SimpleTest(GetTestURL(FilePath(FILE_PATH_LITERAL("transaction_test.html"))));
}
« no previous file with comments | « content/browser/fileapi/file_system_browsertest.cc ('k') | content/browser/media_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698