Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(245)

Side by Side Diff: content/test/blink_test_environment.cc

Issue 580813002: Remove TSan annotations from base/, because ThreadSanitizer v2 doesn't need base::subtle to be anno… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IWYU for RunningOnValgrind() Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/vlog_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/test/blink_test_environment.h" 5 #include "content/test/blink_test_environment.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "base/strings/string_tokenizer.h" 12 #include "base/strings/string_tokenizer.h"
13 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
13 #include "content/public/common/content_switches.h" 14 #include "content/public/common/content_switches.h"
14 #include "content/public/common/user_agent.h" 15 #include "content/public/common/user_agent.h"
15 #include "content/public/test/test_content_client_initializer.h" 16 #include "content/public/test/test_content_client_initializer.h"
16 #include "content/test/test_webkit_platform_support.h" 17 #include "content/test/test_webkit_platform_support.h"
17 #include "third_party/WebKit/public/web/WebCache.h" 18 #include "third_party/WebKit/public/web/WebCache.h"
18 #include "third_party/WebKit/public/web/WebKit.h" 19 #include "third_party/WebKit/public/web/WebKit.h"
19 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" 20 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
20 #include "url/url_util.h" 21 #include "url/url_util.h"
21 22
22 #if defined(OS_WIN) 23 #if defined(OS_WIN)
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 // http://code.google.com/p/chromium/issues/detail?id=9500 116 // http://code.google.com/p/chromium/issues/detail?id=9500
116 base::RunLoop().RunUntilIdle(); 117 base::RunLoop().RunUntilIdle();
117 118
118 if (RunningOnValgrind()) 119 if (RunningOnValgrind())
119 blink::WebCache::clear(); 120 blink::WebCache::clear();
120 delete test_environment; 121 delete test_environment;
121 test_environment = NULL; 122 test_environment = NULL;
122 } 123 }
123 124
124 } // namespace content 125 } // namespace content
OLDNEW
« no previous file with comments | « base/vlog_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698