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

Side by Side Diff: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Issue 2967013002: Be explicit about namespace testing to not mix it with blink::testing (Closed)
Patch Set: Dropped mojo parts that need another review. Created 3 years, 5 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 | « third_party/WebKit/Source/web/tests/LocalFrameClientImplTest.cpp ('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 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 #include "public/web/WebTextCheckingCompletion.h" 161 #include "public/web/WebTextCheckingCompletion.h"
162 #include "public/web/WebTextCheckingResult.h" 162 #include "public/web/WebTextCheckingResult.h"
163 #include "public/web/WebViewClient.h" 163 #include "public/web/WebViewClient.h"
164 #include "testing/gmock/include/gmock/gmock.h" 164 #include "testing/gmock/include/gmock/gmock.h"
165 #include "testing/gtest/include/gtest/gtest.h" 165 #include "testing/gtest/include/gtest/gtest.h"
166 #include "v8/include/v8.h" 166 #include "v8/include/v8.h"
167 #include "web/WebViewImpl.h" 167 #include "web/WebViewImpl.h"
168 168
169 using blink::URLTestHelpers::ToKURL; 169 using blink::URLTestHelpers::ToKURL;
170 using blink::testing::RunPendingTasks; 170 using blink::testing::RunPendingTasks;
171 using testing::ElementsAre; 171 using ::testing::ElementsAre;
172 using testing::Mock; 172 using ::testing::Mock;
173 using testing::_; 173 using ::testing::_;
174 174
175 namespace blink { 175 namespace blink {
176 176
177 #if defined(THREAD_SANITIZER) 177 #if defined(THREAD_SANITIZER)
178 #define DISABLE_ON_TSAN(test_name) DISABLED_##test_name 178 #define DISABLE_ON_TSAN(test_name) DISABLED_##test_name
179 #else 179 #else
180 #define DISABLE_ON_TSAN(test_name) test_name 180 #define DISABLE_ON_TSAN(test_name) test_name
181 #endif // defined(THREAD_SANITIZER) 181 #endif // defined(THREAD_SANITIZER)
182 182
183 ::std::ostream& operator<<(::std::ostream& os, const WebFloatSize& size) { 183 ::std::ostream& operator<<(::std::ostream& os, const WebFloatSize& size) {
(...skipping 11880 matching lines...) Expand 10 before | Expand all | Expand 10 after
12064 tester.ExpectBucketCount(histogramName, kSPANavTypeOtherFragmentNavigation, 12064 tester.ExpectBucketCount(histogramName, kSPANavTypeOtherFragmentNavigation,
12065 1); 12065 1);
12066 // kSameDocumentNavigationHistoryApi and kFrameLoadTypeBackForward is an 12066 // kSameDocumentNavigationHistoryApi and kFrameLoadTypeBackForward is an
12067 // illegal combination, which has been caught by DCHECK in 12067 // illegal combination, which has been caught by DCHECK in
12068 // UpdateForSameDocumentNavigation(). 12068 // UpdateForSameDocumentNavigation().
12069 12069
12070 tester.ExpectTotalCount(histogramName, 3); 12070 tester.ExpectTotalCount(histogramName, 3);
12071 } 12071 }
12072 12072
12073 } // namespace blink 12073 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/tests/LocalFrameClientImplTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698