- Update to Chromium revision 165669.

- Fix Linux/OS-X compile errors (issue #751).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@897 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-11-05 20:18:20 +00:00
parent f18f7fd27f
commit d7493c57a1
35 changed files with 88 additions and 114 deletions

View File

@@ -9,6 +9,7 @@
#include "base/test/test_suite.h"
#if defined(OS_MACOSX)
#include "base/debug/stack_trace.h"
#include "base/file_path.h"
#include "base/i18n/icu_util.h"
#include "base/path_service.h"
@@ -96,7 +97,7 @@ void CefTestSuite::Initialize() {
// Note: temporarily enabled timestamps in an effort to catch bug 6361.
logging::SetLogItems(true, true, true, true);
CHECK(base::EnableInProcessStackDumping());
CHECK(base::debug::EnableInProcessStackDumping());
// In some cases, we do not want to see standard error dialogs.
if (!base::debug::BeingDebugged() &&

View File

@@ -842,6 +842,9 @@ class RequestRendererTest : public ClientApp::RenderDelegate,
class RequestTestHandler : public TestHandler,
public RequestTestRunner::Delegate {
public:
// Don't hide the DestroyTest method.
using TestHandler::DestroyTest;
RequestTestHandler(RequestTestMode test_mode,
bool test_in_browser,
const char* test_url)

View File

@@ -1955,8 +1955,9 @@ class V8TestHandler : public TestHandler {
int httpStatusCode) OVERRIDE {
if (test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION_DEV_TOOLS) {
if (browser->IsPopup()) {
EXPECT_STREQ(GetBrowser()->GetHost()->GetDevToolsURL(true).c_str(),
frame->GetURL().c_str());
EXPECT_STREQ(
GetBrowser()->GetHost()->GetDevToolsURL(true).ToString().c_str(),
frame->GetURL().ToString().c_str());
CefRefPtr<CefProcessMessage> return_msg =
CefProcessMessage::Create(kV8DevToolsLoadHookMsg);
EXPECT_TRUE(browser->SendProcessMessage(PID_RENDERER, return_msg));