From 6337aa6fad84cb921a4aacdd9ca1bf49d6c46fd4 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 19 Aug 2020 18:25:42 -0400 Subject: [PATCH] ceftests: Move TrackCallback to a separate header file --- cef_paths2.gypi | 2 ++ tests/ceftests/test_handler.h | 13 +------------ tests/ceftests/track_callback.h | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 tests/ceftests/track_callback.h diff --git a/cef_paths2.gypi b/cef_paths2.gypi index 0d5d3c385..3ec16e377 100644 --- a/cef_paths2.gypi +++ b/cef_paths2.gypi @@ -528,6 +528,7 @@ 'tests/ceftests/thread_helper.h', 'tests/ceftests/thread_unittest.cc', 'tests/ceftests/tracing_unittest.cc', + 'tests/ceftests/track_callback.h', 'tests/ceftests/translator_unittest.cc', 'tests/ceftests/urlrequest_unittest.cc', 'tests/ceftests/v8_unittest.cc', @@ -591,6 +592,7 @@ 'tests/ceftests/test_suite.h', 'tests/ceftests/test_util.cc', 'tests/ceftests/test_util.h', + 'tests/ceftests/track_callback.h', 'tests/ceftests/thread_helper.cc', 'tests/ceftests/thread_helper.h', 'tests/ceftests/thread_unittest.cc', diff --git a/tests/ceftests/test_handler.h b/tests/ceftests/test_handler.h index 4616c3dde..b72d2a6cf 100644 --- a/tests/ceftests/test_handler.h +++ b/tests/ceftests/test_handler.h @@ -19,20 +19,9 @@ #include "include/cef_task.h" #include "include/cef_waitable_event.h" #include "tests/ceftests/thread_helper.h" +#include "tests/ceftests/track_callback.h" #include "tests/gtest/include/gtest/gtest.h" -class TrackCallback { - public: - TrackCallback() : gotit_(false) {} - void yes() { gotit_ = true; } - bool isSet() { return gotit_; } - void reset() { gotit_ = false; } - operator bool() const { return gotit_; } - - protected: - bool gotit_; -}; - class ResourceContent { public: typedef std::multimap HeaderMap; diff --git a/tests/ceftests/track_callback.h b/tests/ceftests/track_callback.h new file mode 100644 index 000000000..760130261 --- /dev/null +++ b/tests/ceftests/track_callback.h @@ -0,0 +1,21 @@ +// Copyright (c) 2013 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. + +#ifndef CEF_TESTS_CEFTESTS_TRACK_CALLBACK_H_ +#define CEF_TESTS_CEFTESTS_TRACK_CALLBACK_H_ +#pragma once + +class TrackCallback { + public: + TrackCallback() : gotit_(false) {} + void yes() { gotit_ = true; } + bool isSet() { return gotit_; } + void reset() { gotit_ = false; } + operator bool() const { return gotit_; } + + protected: + bool gotit_; +}; + +#endif // CEF_TESTS_CEFTESTS_TRACK_CALLBACK_H_