mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Various fixes related to the C++11/14 update (see issue #3140)
- Convert scoped_ptr to std::unique_ptr from <memory> - Convert arraysize to base::size from include/base/cef_cxx17_backports.h - Convert NULL to nullptr - Include include/base/cef_callback.h instead of include/base/cef_bind.h - Implicit conversion of CefRefPtr<T> or scoped_refptr<T> to T* is gone; use .get() instead See the issue for additional details.
This commit is contained in:
@@ -4,11 +4,11 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
#include <memory>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
|
||||
#include "include/base/cef_bind.h"
|
||||
#include "include/base/cef_scoped_ptr.h"
|
||||
#include "include/base/cef_callback.h"
|
||||
#include "include/cef_request_context_handler.h"
|
||||
#include "include/cef_scheme.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
@@ -3184,7 +3184,7 @@ class RedirectResponseTest : public TestHandler {
|
||||
const bool via_request_context_handler_;
|
||||
|
||||
int browser_id_ = 0;
|
||||
scoped_ptr<ResourceTest> resource_test_;
|
||||
std::unique_ptr<ResourceTest> resource_test_;
|
||||
CefRefPtr<ResourceRequestHandler> resource_request_handler_;
|
||||
|
||||
IMPLEMENT_REFCOUNTING(RedirectResponseTest);
|
||||
@@ -3432,8 +3432,8 @@ const char kInputHeader[] = "<html><head></head><body>";
|
||||
const char kInputFooter[] = "</body></html>";
|
||||
|
||||
// Repeat |content| the minimum number of times necessary to satisfy
|
||||
// |desired_min_size|. If |calculated_repeat_ct| is non-NULL it will be set to
|
||||
// the number of times that |content| was repeated.
|
||||
// |desired_min_size|. If |calculated_repeat_ct| is non-nullptr it will be set
|
||||
// to the number of times that |content| was repeated.
|
||||
std::string CreateInput(const std::string& content,
|
||||
size_t desired_min_size,
|
||||
size_t* calculated_repeat_ct = nullptr) {
|
||||
|
Reference in New Issue
Block a user