Skip to content

Commit c792ccd

Browse files
committed
Revert "Makesure the DLL is loaded"
This reverts commit 063a08e.
1 parent 063a08e commit c792ccd

File tree

3 files changed

+1
-25
lines changed

3 files changed

+1
-25
lines changed

analytics/integration_test/src/integration_test.cc

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ void FirebaseAnalyticsTest::SetUpTestSuite() {
7070
#endif // defined(__ANDROID__)
7171

7272
firebase::analytics::Initialize(*shared_app_);
73-
LogInfo("Analytics DLL Loaded: %s",
74-
firebase::analytics::IsAnalyticsDllLoaded() ? "true" : "false");
7573
did_test_setconsent_ = false;
7674
}
7775

@@ -251,28 +249,17 @@ TEST_F(FirebaseAnalyticsTest, TestSetLogCallback) {
251249
std::promise<void> finishedPromise;
252250
std::future<void> finished = finishedPromise.get_future();
253251
bool log_callback_called = false;
254-
ProcessEvents(1000);
255-
ProcessEvents(1000);
256-
ProcessEvents(1000);
257-
ProcessEvents(1000);
258-
ProcessEvents(1000);
259252

260253
// Save the current log level, and set to verbose for this test.
261254
firebase::LogLevel current_log_level = firebase::GetLogLevel();
262255
firebase::SetLogLevel(firebase::LogLevel::kLogLevelVerbose);
263-
ProcessEvents(1000);
264-
ProcessEvents(1000);
265-
ProcessEvents(1000);
266-
ProcessEvents(1000);
256+
267257
firebase::analytics::SetLogCallback(
268258
[&](firebase::LogLevel log_level, const char* message) {
269259
log_callback_called = true;
270260
finishedPromise.set_value();
271261
});
272262

273-
274-
275-
276263
// Pass kUnknown to trigger a warning log directly from the DLL (on
277264
// Windows),
278265
firebase::analytics::NotifyAppLifecycleChange(firebase::analytics::kUnknown);

analytics/src/analytics_desktop.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,6 @@ bool IsInitialized() { return g_initialized; }
134134

135135
} // namespace internal
136136

137-
#if defined(_WIN32)
138-
bool IsAnalyticsDllLoaded() { return g_analytics_module != 0; }
139-
#else
140-
bool IsAnalyticsDllLoaded() { return false; }
141-
#endif // defined(_WIN32)
142-
143137
// Terminates the Analytics desktop API.
144138
// Call this function when Analytics is no longer needed to free up resources.
145139
void Terminate() {

analytics/src/include/firebase/analytics.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -623,11 +623,6 @@ using LogCallback = std::function<void(LogLevel, const char*)>;
623623
/// @param[in] callback The callback to use. Must be thread-safe.
624624
void SetLogCallback(const LogCallback& callback);
625625

626-
/// @brief Returns true if the Google Analytics DLL was successfully loaded.
627-
///
628-
/// @returns true if the DLL was loaded, false otherwise.
629-
bool IsAnalyticsDllLoaded();
630-
631626
/// @brief The state of an app in its lifecycle.
632627
///
633628
/// kUnknown is an invalid state that is used to capture uninitialized values.

0 commit comments

Comments
 (0)