Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0193133e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Update for Chrome OS libchrome uprev."

parents 03b35eef f08305af

system/bta/vc/vc.cc

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
 */



#include <base/bind.h>

#include <base/bind_helpers.h>

#include <base/logging.h>

#include <base/strings/string_number_conversions.h>

#include <hardware/bt_vc.h>
@@ -24,6 +23,7 @@ 
#include <string>

#include <vector>



#include "bind_helpers.h"

#include "bta_gatt_api.h"

#include "bta_gatt_queue.h"

#include "bta_vc_api.h"

system/bta/vc/vc_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 
 */



#include <base/bind.h>

#include <base/bind_helpers.h>

#include <gmock/gmock.h>

#include <gtest/gtest.h>



#include "bind_helpers.h"

#include "bta_gatt_api_mock.h"

#include "bta_gatt_queue_mock.h"

#include "bta_vc_api.h"

system/common/once_timer_unittest.cc

+1 −1
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ 
 */



#include <base/bind.h>

#include <base/bind_helpers.h>

#include <base/logging.h>

#include <gtest/gtest.h>

#include <future>



#include "bind_helpers.h"

#include "message_loop_thread.h"

#include "once_timer.h"

system/common/repeating_timer_unittest.cc

+1 −1
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ 
 */



#include <base/bind.h>

#include <base/bind_helpers.h>

#include <base/logging.h>

#include <gtest/gtest.h>

#include <future>



#include "bind_helpers.h"

#include "message_loop_thread.h"

#include "repeating_timer.h"

system/gd/common/bind.h

+5 −0
Original line number Diff line number Diff line
@@ -24,7 +24,12 @@ namespace common { 
using base::Bind;

using base::BindOnce;

using base::IgnoreResult;

#if defined(BASE_VER) && BASE_VER >= 860220

// TODO(b/189293646): find a way to avoid base::internal.

using base::internal::MakeUnboundRunType;

#else

using base::MakeUnboundRunType;

#endif

using base::Owned;

using base::Passed;

using base::RetainedRef;