mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-17 04:30:46 +01:00
122397acfc
Changes to the CEF public API: - Add base::Bind, base::Callback, base::Lock, base::WeakPtr, scoped_refptr, scoped_ptr and supporting types. - Add include/wrapper/cef_closure_task.h helpers for converting a base::Closure to a CefTask. - Change CefRefPtr to extend scoped_refptr. -- Change CefBase method signatures to match RefCountedThreadSafeBase. - Change IMPLEMENT_REFCOUNTING to use base::AtomicRefCount*. -- Remove the CefAtomic* functions. -- IMPLEMENT_REFCOUNTING now enforces via a compile-time error that the correct class name was passed to the macro. - Change IMPLEMENT_LOCKING to use base::Lock. -- Remove the CefCriticalSection class. -- Deprecate the IMPLEMENT_LOCKING macro. -- base::Lock will DCHECK() in Debug builds if lock usage is reentrant. - Move include/internal/cef_tuple.h to include/base/cef_tuple.h. - Allow an empty |callback| parameter passed to CefBeginTracing. Changes to the CEF implementation: - Fix incorrect names passed to the IMPLEMENT_REFCOUNTING macro. - Fix instances of reentrant locking in the CefXmlObject and CefRequest implementations. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cef_unittests: - Add tests/unittests/chromium_includes.h and always include it first from unit test .cc files to avoid name conflicts with Chromium types. - Fix wrong header include ordering. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cefclient and cefsimple: - Use base::Bind and cef_closure_task.h instead of NewCefRunnable*. - Remove use of the IMPEMENT_LOCKING macro. - Fix incorrect/unnecessary locking. - Add additional runtime thread checks. - Windows: Perform actions on the UI thread instead of the main thread when running in multi-threaded-message-loop mode to avoid excessive locking. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1769 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
157 lines
4.4 KiB
C++
157 lines
4.4 KiB
C++
// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
|
|
// reserved. Use of this source code is governed by a BSD-style license that
|
|
// can be found in the LICENSE file.
|
|
|
|
// Include this first to avoid type conflicts with CEF headers.
|
|
#include "tests/unittests/chromium_includes.h"
|
|
|
|
#include "include/cef_process_message.h"
|
|
#include "include/cef_task.h"
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
#include "tests/cefclient/client_app.h"
|
|
#include "tests/unittests/test_handler.h"
|
|
#include "tests/unittests/test_util.h"
|
|
|
|
namespace {
|
|
|
|
// Unique values for the SendRecv test.
|
|
const char kSendRecvUrl[] = "http://tests/ProcessMessageTest.SendRecv";
|
|
const char kSendRecvMsg[] = "ProcessMessageTest.SendRecv";
|
|
|
|
// Creates a test message.
|
|
CefRefPtr<CefProcessMessage> CreateTestMessage() {
|
|
CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create(kSendRecvMsg);
|
|
EXPECT_TRUE(msg.get());
|
|
|
|
CefRefPtr<CefListValue> args = msg->GetArgumentList();
|
|
EXPECT_TRUE(args.get());
|
|
|
|
int index = 0;
|
|
args->SetNull(index++);
|
|
args->SetInt(index++, 5);
|
|
args->SetDouble(index++, 10.543);
|
|
args->SetBool(index++, true);
|
|
args->SetString(index++, "test string");
|
|
args->SetList(index++, args->Copy());
|
|
|
|
EXPECT_EQ((size_t)index, args->GetSize());
|
|
|
|
return msg;
|
|
}
|
|
|
|
// Renderer side.
|
|
class SendRecvRendererTest : public ClientApp::RenderDelegate {
|
|
public:
|
|
SendRecvRendererTest() {}
|
|
|
|
virtual bool OnProcessMessageReceived(
|
|
CefRefPtr<ClientApp> app,
|
|
CefRefPtr<CefBrowser> browser,
|
|
CefProcessId source_process,
|
|
CefRefPtr<CefProcessMessage> message) OVERRIDE {
|
|
if (message->GetName() == kSendRecvMsg) {
|
|
EXPECT_TRUE(browser.get());
|
|
EXPECT_EQ(PID_BROWSER, source_process);
|
|
EXPECT_TRUE(message.get());
|
|
|
|
std::string url = browser->GetMainFrame()->GetURL();
|
|
if (url == kSendRecvUrl) {
|
|
// Echo the message back to the sender natively.
|
|
EXPECT_TRUE(browser->SendProcessMessage(PID_BROWSER, message));
|
|
return true;
|
|
}
|
|
}
|
|
|
|
// Message not handled.
|
|
return false;
|
|
}
|
|
|
|
IMPLEMENT_REFCOUNTING(SendRecvRendererTest);
|
|
};
|
|
|
|
// Browser side.
|
|
class SendRecvTestHandler : public TestHandler {
|
|
public:
|
|
SendRecvTestHandler() {
|
|
}
|
|
|
|
virtual void RunTest() OVERRIDE {
|
|
message_ = CreateTestMessage();
|
|
|
|
AddResource(kSendRecvUrl, "<html><body>TEST</body></html>", "text/html");
|
|
CreateBrowser(kSendRecvUrl);
|
|
}
|
|
|
|
virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefFrame> frame,
|
|
int httpStatusCode) OVERRIDE {
|
|
// Send the message to the renderer process.
|
|
EXPECT_TRUE(browser->SendProcessMessage(PID_RENDERER, message_));
|
|
}
|
|
|
|
virtual bool OnProcessMessageReceived(
|
|
CefRefPtr<CefBrowser> browser,
|
|
CefProcessId source_process,
|
|
CefRefPtr<CefProcessMessage> message) OVERRIDE {
|
|
EXPECT_TRUE(browser.get());
|
|
EXPECT_EQ(PID_RENDERER, source_process);
|
|
EXPECT_TRUE(message.get());
|
|
EXPECT_TRUE(message->IsReadOnly());
|
|
|
|
// Verify that the recieved message is the same as the sent message.
|
|
TestProcessMessageEqual(message_, message);
|
|
|
|
got_message_.yes();
|
|
|
|
// Test is complete.
|
|
DestroyTest();
|
|
|
|
return true;
|
|
}
|
|
|
|
CefRefPtr<CefProcessMessage> message_;
|
|
TrackCallback got_message_;
|
|
};
|
|
|
|
} // namespace
|
|
|
|
// Verify send and recieve.
|
|
TEST(ProcessMessageTest, SendRecv) {
|
|
CefRefPtr<SendRecvTestHandler> handler = new SendRecvTestHandler();
|
|
handler->ExecuteTest();
|
|
|
|
EXPECT_TRUE(handler->got_message_);
|
|
}
|
|
|
|
// Verify create.
|
|
TEST(ProcessMessageTest, Create) {
|
|
CefRefPtr<CefProcessMessage> message =
|
|
CefProcessMessage::Create(kSendRecvMsg);
|
|
EXPECT_TRUE(message.get());
|
|
EXPECT_TRUE(message->IsValid());
|
|
EXPECT_FALSE(message->IsReadOnly());
|
|
EXPECT_STREQ(kSendRecvMsg, message->GetName().ToString().c_str());
|
|
|
|
CefRefPtr<CefListValue> args = message->GetArgumentList();
|
|
EXPECT_TRUE(args.get());
|
|
EXPECT_TRUE(args->IsValid());
|
|
EXPECT_TRUE(args->IsOwned());
|
|
EXPECT_FALSE(args->IsReadOnly());
|
|
}
|
|
|
|
// Verify copy.
|
|
TEST(ProcessMessageTest, Copy) {
|
|
CefRefPtr<CefProcessMessage> message = CreateTestMessage();
|
|
CefRefPtr<CefProcessMessage> message2 = message->Copy();
|
|
TestProcessMessageEqual(message, message2);
|
|
}
|
|
|
|
|
|
// Entry point for creating process message renderer test objects.
|
|
// Called from client_app_delegates.cc.
|
|
void CreateProcessMessageRendererTests(
|
|
ClientApp::RenderDelegateSet& delegates) {
|
|
// For ProcessMessageTest.SendRecv
|
|
delegates.insert(new SendRecvRendererTest);
|
|
}
|