bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove Chromium target dependencies for unit tests (issue #1632)

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-11-16 15:24:13 -05:00
parent ef6df50bf9
commit f557d325c1
18 changed files with 263 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wrapper/cef_resource_manager.h
View File

@@ -159,18 +159,18 @@ class CefResourceManager :
// The below methods are called on the browser process IO thread.
explicit Request(SCOPED_PTR(RequestState) state);
explicit Request(scoped_ptr<RequestState> state);
SCOPED_PTR(RequestState) SendRequest();
scoped_ptr<RequestState> SendRequest();
bool HasState();
static void ContinueOnIOThread(SCOPED_PTR(RequestState) state,
static void ContinueOnIOThread(scoped_ptr<RequestState> state,
CefRefPtr<CefResourceHandler> handler);
static void StopOnIOThread(SCOPED_PTR(RequestState) state);
static void StopOnIOThread(scoped_ptr<RequestState> state);
// Will be non-NULL while the request is pending. Only accessed on the
// browser process IO thread.
SCOPED_PTR(RequestState) state_;
scoped_ptr<RequestState> state_;
// Params that stay with this request object. Safe to access on any thread.
RequestParams params_;
@@ -343,10 +343,10 @@ class CefResourceManager :
// Methods that manage request state between requests. Called on the browser
// process IO thread.
bool SendRequest(SCOPED_PTR(RequestState) state);
void ContinueRequest(SCOPED_PTR(RequestState) state,
bool SendRequest(scoped_ptr<RequestState> state);
void ContinueRequest(scoped_ptr<RequestState> state,
CefRefPtr<CefResourceHandler> handler);
void StopRequest(SCOPED_PTR(RequestState) state);
void StopRequest(scoped_ptr<RequestState> state);
bool IncrementProvider(RequestState* state);
void DetachRequestFromProvider(RequestState* state);
void GetNextValidProvider(ProviderEntryList::iterator& iterator);
@@ -365,7 +365,7 @@ class CefResourceManager :
MimeTypeResolver mime_type_resolver_;
// Must be the last member. Created and accessed on the IO thread.
SCOPED_PTR(base::WeakPtrFactory<CefResourceManager>) weak_ptr_factory_;
scoped_ptr<base::WeakPtrFactory<CefResourceManager> > weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(CefResourceManager);
};