Chromium Code Reviews| Index: chrome/browser/chromeos/policy/device_status_collector_browsertest.cc |
| diff --git a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc |
| index 4c3c5313c771d0650fd80125126fedad1a41513f..1897cec56cba09ef69da437039b21027a599eda5 100644 |
| --- a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc |
| +++ b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc |
| @@ -56,7 +56,6 @@ |
| #include "content/public/browser/browser_thread.h" |
| #include "content/public/test/test_browser_thread.h" |
| #include "content/public/test/test_utils.h" |
| -#include "mojo/public/cpp/bindings/string.h" |
| #include "storage/browser/fileapi/external_mount_points.h" |
| #include "storage/browser/fileapi/mount_points.h" |
| #include "storage/common/fileapi/file_system_mount_option.h" |
| @@ -226,14 +225,14 @@ std::vector<em::CPUTempInfo> GetEmptyCPUTempInfo() { |
| void CallAndroidStatusReceiver( |
| const policy::DeviceStatusCollector::AndroidStatusReceiver& receiver, |
| - mojo::String status, |
| - mojo::String droid_guard_info) { |
| + std::string status, |
|
yzshen1
2017/01/03 21:44:41
Please use const&. (here and elsewhere)
Sam McNally
2017/01/03 23:44:28
Done.
|
| + std::string droid_guard_info) { |
| receiver.Run(status, droid_guard_info); |
| } |
| bool GetFakeAndroidStatus( |
| - mojo::String status, |
| - mojo::String droid_guard_info, |
| + std::string status, |
| + std::string droid_guard_info, |
| const policy::DeviceStatusCollector::AndroidStatusReceiver& receiver) { |
| // Post it to the thread because this call is expected to be asynchronous. |
| base::ThreadTaskRunnerHandle::Get()->PostTask( |