Update from https://crrev.com/320343
This required some manual patching to ui/event and ui/gfx.
Sky tests were suppressed.
https://github.com/domokit/mojo/issues/64
BUG=401761
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/1001833005
diff --git a/base/test/sequenced_worker_pool_owner.h b/base/test/sequenced_worker_pool_owner.h
index b52dd67..bf5f2f7 100644
--- a/base/test/sequenced_worker_pool_owner.h
+++ b/base/test/sequenced_worker_pool_owner.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BASE_THREADING_SEQUENCED_WORKER_POOL_UNITTEST_H_
-#define BASE_THREADING_SEQUENCED_WORKER_POOL_UNITTEST_H_
+#ifndef BASE_TEST_SEQUENCED_WORKER_POOL_OWNER_H_
+#define BASE_TEST_SEQUENCED_WORKER_POOL_OWNER_H_
#include <cstddef>
#include <string>
@@ -58,4 +58,4 @@
} // namespace base
-#endif // BASE_THREADING_SEQUENCED_WORKER_POOL_UNITTEST_H_
+#endif // BASE_TEST_SEQUENCED_WORKER_POOL_OWNER_H_
