summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 14:45:53 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 14:45:53 +0000
commit225020ce43ccb72f34a73c62dd4aec7861ea94d6 (patch)
tree6076da069cbd48ee45f88ea923eeb8a609f8be6a /content
parent2c5c7e875ce6da463ae266f2183a529101c6f96c (diff)
downloadchromium_src-225020ce43ccb72f34a73c62dd4aec7861ea94d6.zip
chromium_src-225020ce43ccb72f34a73c62dd4aec7861ea94d6.tar.gz
chromium_src-225020ce43ccb72f34a73c62dd4aec7861ea94d6.tar.bz2
Replace all usages of FRIEND_TEST() with FRIEND_TEST_ALL_PREFIXES()
BUG=105287 TEST=NONE Review URL: http://codereview.chromium.org/8678017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111935 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/in_process_webkit/indexed_db_context.h8
-rw-r--r--content/common/sandbox_mac.h6
2 files changed, 7 insertions, 7 deletions
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);
};