summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/json/json_reader.h10
-rw-r--r--base/metrics/field_trial.h26
-rw-r--r--base/metrics/histogram.h12
-rw-r--r--chrome/browser/extensions/extension_updater.h4
-rw-r--r--chrome/browser/net/connect_interceptor.h4
-rw-r--r--chrome/browser/prerender/prerender_manager.h31
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_database.h4
-rw-r--r--chrome/browser/sync/notifier/cache_invalidation_packet_handler.h2
-rw-r--r--chrome/renderer/spellchecker/spellcheck.h2
-rw-r--r--content/browser/in_process_webkit/indexed_db_context.h8
-rw-r--r--content/common/sandbox_mac.h6
-rw-r--r--media/filters/audio_renderer_base_unittest.cc8
-rw-r--r--sandbox/src/interception.h13
-rw-r--r--sandbox/src/sharedmem_ipc_server.h9
14 files changed, 73 insertions, 66 deletions
diff --git a/base/json/json_reader.h b/base/json/json_reader.h
index e91da2e..be3aef2 100644
--- a/base/json/json_reader.h
+++ b/base/json/json_reader.h
@@ -40,6 +40,12 @@
#define FRIEND_TEST(test_case_name, test_name)\
friend class test_case_name##_##test_name##_Test
+#define FRIEND_TEST_ALL_PREFIXES(test_case_name, test_name) \
+ FRIEND_TEST(test_case_name, test_name); \
+ FRIEND_TEST(test_case_name, DISABLED_##test_name); \
+ FRIEND_TEST(test_case_name, FLAKY_##test_name); \
+ FRIEND_TEST(test_case_name, FAILS_##test_name)
+
namespace base {
class Value;
@@ -149,8 +155,8 @@ class BASE_EXPORT JSONReader {
bool allow_trailing_comma);
private:
- FRIEND_TEST(JSONReaderTest, Reading);
- FRIEND_TEST(JSONReaderTest, ErrorMessages);
+ FRIEND_TEST_ALL_PREFIXES(JSONReaderTest, Reading);
+ FRIEND_TEST_ALL_PREFIXES(JSONReaderTest, ErrorMessages);
static std::string FormatErrorMessage(int line, int column,
const std::string& description);
diff --git a/base/metrics/field_trial.h b/base/metrics/field_trial.h
index e7a4506..5652b00 100644
--- a/base/metrics/field_trial.h
+++ b/base/metrics/field_trial.h
@@ -161,19 +161,19 @@ class BASE_EXPORT FieldTrial : public RefCounted<FieldTrial> {
private:
// Allow tests to access our innards for testing purposes.
- FRIEND_TEST(FieldTrialTest, Registration);
- FRIEND_TEST(FieldTrialTest, AbsoluteProbabilities);
- FRIEND_TEST(FieldTrialTest, RemainingProbability);
- FRIEND_TEST(FieldTrialTest, FiftyFiftyProbability);
- FRIEND_TEST(FieldTrialTest, MiddleProbabilities);
- FRIEND_TEST(FieldTrialTest, OneWinner);
- FRIEND_TEST(FieldTrialTest, DisableProbability);
- FRIEND_TEST(FieldTrialTest, Save);
- FRIEND_TEST(FieldTrialTest, DuplicateRestore);
- FRIEND_TEST(FieldTrialTest, MakeName);
- FRIEND_TEST(FieldTrialTest, HashClientId);
- FRIEND_TEST(FieldTrialTest, HashClientIdIsUniform);
- FRIEND_TEST(FieldTrialTest, UseOneTimeRandomization);
+ FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, Registration);
+ FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, AbsoluteProbabilities);
+ FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, RemainingProbability);
+ FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, FiftyFiftyProbability);
+ FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, MiddleProbabilities);
+ FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, OneWinner);
+ FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, DisableProbability);
+ FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, Save);
+ FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, DuplicateRestore);
+ FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, MakeName);
+ FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, HashClientId);
+ FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, HashClientIdIsUniform);
+ FRIEND_TEST_ALL_PREFIXES(FieldTrialTest, UseOneTimeRandomization);
friend class base::FieldTrialList;
diff --git a/base/metrics/histogram.h b/base/metrics/histogram.h
index 50cd90d..0b94613 100644
--- a/base/metrics/histogram.h
+++ b/base/metrics/histogram.h
@@ -417,7 +417,7 @@ class BASE_EXPORT Histogram {
private:
// Allow tests to corrupt our innards for testing purposes.
- FRIEND_TEST(HistogramTest, CorruptSampleCounts);
+ FRIEND_TEST_ALL_PREFIXES(HistogramTest, CorruptSampleCounts);
// To help identify memory corruption, we reduntantly save the number of
// samples we've accumulated into all of our buckets. We can compare this
@@ -580,10 +580,10 @@ class BASE_EXPORT Histogram {
private:
// Allow tests to corrupt our innards for testing purposes.
- FRIEND_TEST(HistogramTest, CorruptBucketBounds);
- FRIEND_TEST(HistogramTest, CorruptSampleCounts);
- FRIEND_TEST(HistogramTest, Crc32SampleHash);
- FRIEND_TEST(HistogramTest, Crc32TableTest);
+ FRIEND_TEST_ALL_PREFIXES(HistogramTest, CorruptBucketBounds);
+ FRIEND_TEST_ALL_PREFIXES(HistogramTest, CorruptSampleCounts);
+ FRIEND_TEST_ALL_PREFIXES(HistogramTest, Crc32SampleHash);
+ FRIEND_TEST_ALL_PREFIXES(HistogramTest, Crc32TableTest);
friend class StatisticsRecorder; // To allow it to delete duplicates.
@@ -874,7 +874,7 @@ class BASE_EXPORT CachedRanges {
private:
// Allow tests to corrupt our innards for testing purposes.
- FRIEND_TEST(HistogramTest, CorruptBucketBounds);
+ FRIEND_TEST_ALL_PREFIXES(HistogramTest, CorruptBucketBounds);
// A monotonically increasing list of values which determine which bucket to
// put a sample into. For each index, show the smallest sample that can be
diff --git a/chrome/browser/extensions/extension_updater.h b/chrome/browser/extensions/extension_updater.h
index a514767..d77f4a49 100644
--- a/chrome/browser/extensions/extension_updater.h
+++ b/chrome/browser/extensions/extension_updater.h
@@ -386,8 +386,8 @@ class ExtensionUpdater : public content::URLFetcherDelegate,
// Fetched CRX files waiting to be installed.
std::stack<FetchedCRXFile> fetched_crx_files_;
- FRIEND_TEST(ExtensionUpdaterTest, TestStartUpdateCheckMemory);
- FRIEND_TEST(ExtensionUpdaterTest, TestAfterStopBehavior);
+ FRIEND_TEST_ALL_PREFIXES(ExtensionUpdaterTest, TestStartUpdateCheckMemory);
+ FRIEND_TEST_ALL_PREFIXES(ExtensionUpdaterTest, TestAfterStopBehavior);
DISALLOW_COPY_AND_ASSIGN(ExtensionUpdater);
};
diff --git a/chrome/browser/net/connect_interceptor.h b/chrome/browser/net/connect_interceptor.h
index 657700e..1f2a9df 100644
--- a/chrome/browser/net/connect_interceptor.h
+++ b/chrome/browser/net/connect_interceptor.h
@@ -37,8 +37,8 @@ class ConnectInterceptor : public net::URLRequestJobFactory::Interceptor {
private:
// Provide access to local class TimedCache for testing.
- FRIEND_TEST(ConnectInterceptorTest, TimedCacheRecall);
- FRIEND_TEST(ConnectInterceptorTest, TimedCacheEviction);
+ FRIEND_TEST_ALL_PREFIXES(ConnectInterceptorTest, TimedCacheRecall);
+ FRIEND_TEST_ALL_PREFIXES(ConnectInterceptorTest, TimedCacheEviction);
// Define a LRU cache that recalls all navigations within the last N seconds.
// When we learn about subresources to possibly preconnect to, it would be a
diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h
index 87adfe6..55e550c 100644
--- a/chrome/browser/prerender/prerender_manager.h
+++ b/chrome/browser/prerender/prerender_manager.h
@@ -9,6 +9,7 @@
#include <list>
#include <string>
+#include "base/gtest_prod_util.h"
#include "base/hash_tables.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
@@ -227,21 +228,21 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
// Test that needs needs access to internal functions.
friend class PrerenderBrowserTest;
- FRIEND_TEST(PrerenderManagerTest, AliasURLTest);
- FRIEND_TEST(PrerenderManagerTest, ClearTest);
- FRIEND_TEST(PrerenderManagerTest, ControlGroup);
- FRIEND_TEST(PrerenderManagerTest, DropOldestRequestTest);
- FRIEND_TEST(PrerenderManagerTest, DropSecondRequestTest);
- FRIEND_TEST(PrerenderManagerTest, ExpireTest);
- FRIEND_TEST(PrerenderManagerTest, FoundTest);
- FRIEND_TEST(PrerenderManagerTest, FragmentMatchesFragmentTest);
- FRIEND_TEST(PrerenderManagerTest, FragmentMatchesPageTest);
- FRIEND_TEST(PrerenderManagerTest, PageMatchesFragmentTest);
- FRIEND_TEST(PrerenderManagerTest, PendingPrerenderTest);
- FRIEND_TEST(PrerenderManagerTest, RateLimitInWindowTest);
- FRIEND_TEST(PrerenderManagerTest, RateLimitOutsideWindowTest);
- FRIEND_TEST(PrerenderManagerTest, SourceRenderViewClosed);
- FRIEND_TEST(PrerenderManagerTest, TwoElementPrerenderTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, AliasURLTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, ClearTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, ControlGroup);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, DropOldestRequestTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, DropSecondRequestTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, ExpireTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, FoundTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, FragmentMatchesFragmentTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, FragmentMatchesPageTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, PageMatchesFragmentTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, PendingPrerenderTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, RateLimitInWindowTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, RateLimitOutsideWindowTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, SourceRenderViewClosed);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, TwoElementPrerenderTest);
struct PrerenderContentsData;
struct NavigationRecord;
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h
index 0c95a43..e254190 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database.h
+++ b/chrome/browser/safe_browsing/safe_browsing_database.h
@@ -10,11 +10,11 @@
#include <vector>
#include "base/file_path.h"
+#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h"
#include "base/task.h"
#include "chrome/browser/safe_browsing/safe_browsing_store.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
namespace base {
class Time;
@@ -249,7 +249,7 @@ class SafeBrowsingDatabaseNew : public SafeBrowsingDatabase {
private:
friend class SafeBrowsingDatabaseTest;
- FRIEND_TEST(SafeBrowsingDatabaseTest, HashCaching);
+ FRIEND_TEST_ALL_PREFIXES(SafeBrowsingDatabaseTest, HashCaching);
// A SafeBrowsing whitelist contains a list of whitelisted full-hashes (stored
// in a sorted vector) as well as a boolean flag indicating whether all
diff --git a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h
index 8a071a8..3e3943e 100644
--- a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h
+++ b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h
@@ -46,7 +46,7 @@ class CacheInvalidationPacketHandler {
invalidation::MessageCallback* incoming_receiver);
private:
- FRIEND_TEST(CacheInvalidationPacketHandlerTest, Basic);
+ FRIEND_TEST_ALL_PREFIXES(CacheInvalidationPacketHandlerTest, Basic);
void HandleInboundPacket(const std::string& packet);
void HandleChannelContextChange(const std::string& context);
diff --git a/chrome/renderer/spellchecker/spellcheck.h b/chrome/renderer/spellchecker/spellcheck.h
index 2c5e2b2..c046c1b 100644
--- a/chrome/renderer/spellchecker/spellcheck.h
+++ b/chrome/renderer/spellchecker/spellcheck.h
@@ -68,7 +68,7 @@ class SpellCheck : public content::RenderProcessObserver {
}
private:
- FRIEND_TEST(SpellCheckTest, GetAutoCorrectionWord_EN_US);
+ FRIEND_TEST_ALL_PREFIXES(SpellCheckTest, GetAutoCorrectionWord_EN_US);
// RenderProcessObserver implementation:
virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
diff --git a/content/browser/in_process_webkit/indexed_db_context.h b/content/browser/in_process_webkit/indexed_db_context.h
index 12696a7..5796fb0 100644
--- a/content/browser/in_process_webkit/indexed_db_context.h
+++ b/content/browser/in_process_webkit/indexed_db_context.h
@@ -82,10 +82,10 @@ class CONTENT_EXPORT IndexedDBContext
}
private:
- FRIEND_TEST(ExtensionServiceTest, ClearExtensionData);
- FRIEND_TEST(ExtensionServiceTest, ClearAppData);
- FRIEND_TEST(IndexedDBBrowserTest, ClearLocalState);
- FRIEND_TEST(IndexedDBBrowserTest, ClearSessionOnlyDatabases);
+ FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, ClearExtensionData);
+ FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, ClearAppData);
+ FRIEND_TEST_ALL_PREFIXES(IndexedDBBrowserTest, ClearLocalState);
+ FRIEND_TEST_ALL_PREFIXES(IndexedDBBrowserTest, ClearSessionOnlyDatabases);
friend class IndexedDBQuotaClientTest;
typedef std::map<GURL, int64> OriginToSizeMap;
diff --git a/content/common/sandbox_mac.h b/content/common/sandbox_mac.h
index c9710c3..5fc96d9 100644
--- a/content/common/sandbox_mac.h
+++ b/content/common/sandbox_mac.h
@@ -149,9 +149,9 @@ class Sandbox {
// This path is not necessarily unique e.g. in the face of hardlinks.
static void GetCanonicalSandboxPath(FilePath* path);
- FRIEND_TEST(MacDirAccessSandboxTest, StringEscape);
- FRIEND_TEST(MacDirAccessSandboxTest, RegexEscape);
- FRIEND_TEST(MacDirAccessSandboxTest, DISABLED_SandboxAccess);
+ FRIEND_TEST_ALL_PREFIXES(MacDirAccessSandboxTest, StringEscape);
+ FRIEND_TEST_ALL_PREFIXES(MacDirAccessSandboxTest, RegexEscape);
+ FRIEND_TEST_ALL_PREFIXES(MacDirAccessSandboxTest, DISABLED_SandboxAccess);
DISALLOW_IMPLICIT_CONSTRUCTORS(Sandbox);
};
diff --git a/media/filters/audio_renderer_base_unittest.cc b/media/filters/audio_renderer_base_unittest.cc
index 5682d37..6f53c0c 100644
--- a/media/filters/audio_renderer_base_unittest.cc
+++ b/media/filters/audio_renderer_base_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/bind.h"
+#include "base/gtest_prod_util.h"
#include "base/stl_util.h"
#include "media/base/data_buffer.h"
#include "media/base/mock_callback.h"
@@ -10,7 +11,6 @@
#include "media/base/mock_filters.h"
#include "media/filters/audio_renderer_base.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
using ::testing::_;
using ::testing::AnyNumber;
@@ -40,9 +40,9 @@ class MockAudioRendererBase : public AudioRendererBase {
MOCK_METHOD1(CheckPoint, void(int id));
private:
- FRIEND_TEST(AudioRendererBaseTest, OneCompleteReadCycle);
- FRIEND_TEST(AudioRendererBaseTest, Underflow);
- FRIEND_TEST(AudioRendererBaseTest, Underflow_EndOfStream);
+ FRIEND_TEST_ALL_PREFIXES(AudioRendererBaseTest, OneCompleteReadCycle);
+ FRIEND_TEST_ALL_PREFIXES(AudioRendererBaseTest, Underflow);
+ FRIEND_TEST_ALL_PREFIXES(AudioRendererBaseTest, Underflow_EndOfStream);
friend class AudioRendererBaseTest;
DISALLOW_COPY_AND_ASSIGN(MockAudioRendererBase);
diff --git a/sandbox/src/interception.h b/sandbox/src/interception.h
index 3dd3639..c02b0ff 100644
--- a/sandbox/src/interception.h
+++ b/sandbox/src/interception.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -13,12 +13,9 @@
#include <string>
#include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
#include "sandbox/src/sandbox_types.h"
-#pragma warning(push, 3)
-#include "testing/gtest/include/gtest/gtest.h"
-#pragma warning(pop)
-
namespace sandbox {
class TargetProcess;
@@ -60,8 +57,10 @@ struct DllInterceptionData;
//
class InterceptionManager {
// The unit test will access private members.
- FRIEND_TEST(InterceptionManagerTest, BufferLayout1);
- FRIEND_TEST(InterceptionManagerTest, BufferLayout2);
+ // Allow tests to be marked DISABLED_. Note that FLAKY_ and FAILS_ prefixes
+ // do not work with sandbox tests.
+ FRIEND_TEST_ALL_PREFIXES(InterceptionManagerTest, BufferLayout1);
+ FRIEND_TEST_ALL_PREFIXES(InterceptionManagerTest, BufferLayout2);
public:
// An interception manager performs interceptions on a given child process.
diff --git a/sandbox/src/sharedmem_ipc_server.h b/sandbox/src/sharedmem_ipc_server.h
index 7d55157..568d8ed 100644
--- a/sandbox/src/sharedmem_ipc_server.h
+++ b/sandbox/src/sharedmem_ipc_server.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -8,12 +8,11 @@
#include <list>
#include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
#include "sandbox/src/crosscall_params.h"
#include "sandbox/src/crosscall_server.h"
#include "sandbox/src/sharedmem_ipc_client.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
-
// IPC transport implementation that uses shared memory.
// This is the server side
//
@@ -53,7 +52,9 @@ class SharedMemIPCServer {
bool Init(void* shared_mem, size_t shared_size, size_t channel_size);
private:
- FRIEND_TEST(IPCTest, SharedMemServerTests);
+ // Allow tests to be marked DISABLED_. Note that FLAKY_ and FAILS_ prefixes
+ // do not work with sandbox tests.
+ FRIEND_TEST_ALL_PREFIXES(IPCTest, SharedMemServerTests);
// When an event fires (IPC request). A thread from the ThreadProvider
// will call this function. The context parameter should be the same as
// provided when ThreadProvider::RegisterWait was called.
generated by cgit v1.1 at 2025-02-14 23:24:18 +0000