mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
ceftests: Minor code cleanup
This commit is contained in:
@@ -299,8 +299,7 @@ class TestServerObserver : public test_server::ObserverHelper {
|
|||||||
base::OnceClosure done_callback)
|
base::OnceClosure done_callback)
|
||||||
: setup_(setup),
|
: setup_(setup),
|
||||||
ready_callback_(std::move(ready_callback)),
|
ready_callback_(std::move(ready_callback)),
|
||||||
done_callback_(std::move(done_callback)),
|
done_callback_(std::move(done_callback)) {
|
||||||
weak_ptr_factory_(this) {
|
|
||||||
DCHECK(setup);
|
DCHECK(setup);
|
||||||
Initialize();
|
Initialize();
|
||||||
}
|
}
|
||||||
@@ -343,8 +342,6 @@ class TestServerObserver : public test_server::ObserverHelper {
|
|||||||
base::OnceClosure ready_callback_;
|
base::OnceClosure ready_callback_;
|
||||||
base::OnceClosure done_callback_;
|
base::OnceClosure done_callback_;
|
||||||
|
|
||||||
base::WeakPtrFactory<TestServerObserver> weak_ptr_factory_;
|
|
||||||
|
|
||||||
DISALLOW_COPY_AND_ASSIGN(TestServerObserver);
|
DISALLOW_COPY_AND_ASSIGN(TestServerObserver);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -385,14 +385,6 @@ void TestHandler::CloseBrowser(CefRefPtr<CefBrowser> browser,
|
|||||||
browser->GetHost()->CloseBrowser(force_close);
|
browser->GetHost()->CloseBrowser(force_close);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TestHandler::AddResource(const std::string& url,
|
|
||||||
const std::string& content,
|
|
||||||
const std::string& mime_type) {
|
|
||||||
ResourceContent::HeaderMap headerMap = ResourceContent::HeaderMap();
|
|
||||||
ResourceContent rc = ResourceContent(content, mime_type, headerMap);
|
|
||||||
AddResourceEx(url, rc);
|
|
||||||
}
|
|
||||||
|
|
||||||
void TestHandler::AddResource(const std::string& url,
|
void TestHandler::AddResource(const std::string& url,
|
||||||
const std::string& content,
|
const std::string& content,
|
||||||
const std::string& mime_type,
|
const std::string& mime_type,
|
||||||
|
@@ -233,14 +233,10 @@ class TestHandler : public CefClient,
|
|||||||
CefRefPtr<CefDictionaryValue> extra_info = nullptr);
|
CefRefPtr<CefDictionaryValue> extra_info = nullptr);
|
||||||
static void CloseBrowser(CefRefPtr<CefBrowser> browser, bool force_close);
|
static void CloseBrowser(CefRefPtr<CefBrowser> browser, bool force_close);
|
||||||
|
|
||||||
void AddResource(const std::string& url,
|
|
||||||
const std::string& content,
|
|
||||||
const std::string& mime_type);
|
|
||||||
|
|
||||||
void AddResource(const std::string& url,
|
void AddResource(const std::string& url,
|
||||||
const std::string& content,
|
const std::string& content,
|
||||||
const std::string& mime_type,
|
const std::string& mime_type,
|
||||||
const ResourceContent::HeaderMap& header_map);
|
const ResourceContent::HeaderMap& header_map = {});
|
||||||
|
|
||||||
void AddResourceEx(const std::string& url, const ResourceContent& content);
|
void AddResourceEx(const std::string& url, const ResourceContent& content);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user