diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 16:24:13 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 14:13:32 +0100 |
| commit | 3f50c38dc070f4bb515c1b64450dae14f316474e (patch) | |
| tree | 29f309f9534e05c47244eedb438fc612578d133b /base/tools_sanity_unittest.cc | |
| parent | e23bef148f7be2bdf9c3cb2cd3aa5ceebf1190fb (diff) | |
| download | external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.zip external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.gz external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.bz2 | |
Merge Chromium at r10.0.634.0: Initial merge by git.
Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
Diffstat (limited to 'base/tools_sanity_unittest.cc')
| -rw-r--r-- | base/tools_sanity_unittest.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/base/tools_sanity_unittest.cc b/base/tools_sanity_unittest.cc index 2824836..779c236 100644 --- a/base/tools_sanity_unittest.cc +++ b/base/tools_sanity_unittest.cc @@ -1,12 +1,14 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "base/message_loop.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h" +namespace base { + namespace { // We use caps here just to ensure that the method name doesn't interfere with @@ -136,3 +138,5 @@ TEST(ToolsSanityTest, DataRace) { delete thread1; delete thread2; } + +} // namespace base |