diff options
author | brettw <brettw@chromium.org> | 2015-05-29 15:15:47 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-29 22:16:36 +0000 |
commit | d5ca2bc110d2bcf78dbfafc8b4f8d69663594e77 (patch) | |
tree | 5e571190738d8545b83558db29f4856afbf53556 /tools | |
parent | e124019512f944ad49114dea310531418d53ff7e (diff) | |
download | chromium_src-d5ca2bc110d2bcf78dbfafc8b4f8d69663594e77.zip chromium_src-d5ca2bc110d2bcf78dbfafc8b4f8d69663594e77.tar.gz chromium_src-d5ca2bc110d2bcf78dbfafc8b4f8d69663594e77.tar.bz2 |
Move Tuple to base namespace.
Namespace change only, no functionality change.
The only non-search-and-replace change is in generate_gmock_mutant.py which changes some line wrapping logic for the generated gmock_mutant header.
NOPRESUBMIT=true
(No presubmit due to long lines in the generated gmock_mutant.h header).
R=sky
Review URL: https://codereview.chromium.org/1159553007
Cr-Commit-Position: refs/heads/master@{#332058}
Diffstat (limited to 'tools')
-rw-r--r-- | tools/ipc_fuzzer/fuzzer/fuzzer.cc | 67 |
1 files changed, 34 insertions, 33 deletions
diff --git a/tools/ipc_fuzzer/fuzzer/fuzzer.cc b/tools/ipc_fuzzer/fuzzer/fuzzer.cc index d6e324a..58dcf57 100644 --- a/tools/ipc_fuzzer/fuzzer/fuzzer.cc +++ b/tools/ipc_fuzzer/fuzzer/fuzzer.cc @@ -209,58 +209,58 @@ struct FuzzTraits<base::string16> { // Specializations for tuples. template <> -struct FuzzTraits<Tuple<>> { - static bool Fuzz(Tuple<>* p, Fuzzer* fuzzer) { +struct FuzzTraits<base::Tuple<>> { + static bool Fuzz(base::Tuple<>* p, Fuzzer* fuzzer) { return true; } }; template <class A> -struct FuzzTraits<Tuple<A>> { - static bool Fuzz(Tuple<A>* p, Fuzzer* fuzzer) { - return FuzzParam(&get<0>(*p), fuzzer); +struct FuzzTraits<base::Tuple<A>> { + static bool Fuzz(base::Tuple<A>* p, Fuzzer* fuzzer) { + return FuzzParam(&base::get<0>(*p), fuzzer); } }; template <class A, class B> -struct FuzzTraits<Tuple<A, B>> { - static bool Fuzz(Tuple<A, B>* p, Fuzzer* fuzzer) { +struct FuzzTraits<base::Tuple<A, B>> { + static bool Fuzz(base::Tuple<A, B>* p, Fuzzer* fuzzer) { return - FuzzParam(&get<0>(*p), fuzzer) && - FuzzParam(&get<1>(*p), fuzzer); + FuzzParam(&base::get<0>(*p), fuzzer) && + FuzzParam(&base::get<1>(*p), fuzzer); } }; template <class A, class B, class C> -struct FuzzTraits<Tuple<A, B, C>> { - static bool Fuzz(Tuple<A, B, C>* p, Fuzzer* fuzzer) { +struct FuzzTraits<base::Tuple<A, B, C>> { + static bool Fuzz(base::Tuple<A, B, C>* p, Fuzzer* fuzzer) { return - FuzzParam(&get<0>(*p), fuzzer) && - FuzzParam(&get<1>(*p), fuzzer) && - FuzzParam(&get<2>(*p), fuzzer); + FuzzParam(&base::get<0>(*p), fuzzer) && + FuzzParam(&base::get<1>(*p), fuzzer) && + FuzzParam(&base::get<2>(*p), fuzzer); } }; template <class A, class B, class C, class D> -struct FuzzTraits<Tuple<A, B, C, D>> { - static bool Fuzz(Tuple<A, B, C, D>* p, Fuzzer* fuzzer) { +struct FuzzTraits<base::Tuple<A, B, C, D>> { + static bool Fuzz(base::Tuple<A, B, C, D>* p, Fuzzer* fuzzer) { return - FuzzParam(&get<0>(*p), fuzzer) && - FuzzParam(&get<1>(*p), fuzzer) && - FuzzParam(&get<2>(*p), fuzzer) && - FuzzParam(&get<3>(*p), fuzzer); + FuzzParam(&base::get<0>(*p), fuzzer) && + FuzzParam(&base::get<1>(*p), fuzzer) && + FuzzParam(&base::get<2>(*p), fuzzer) && + FuzzParam(&base::get<3>(*p), fuzzer); } }; template <class A, class B, class C, class D, class E> -struct FuzzTraits<Tuple<A, B, C, D, E>> { - static bool Fuzz(Tuple<A, B, C, D, E>* p, Fuzzer* fuzzer) { +struct FuzzTraits<base::Tuple<A, B, C, D, E>> { + static bool Fuzz(base::Tuple<A, B, C, D, E>* p, Fuzzer* fuzzer) { return - FuzzParam(&get<0>(*p), fuzzer) && - FuzzParam(&get<1>(*p), fuzzer) && - FuzzParam(&get<2>(*p), fuzzer) && - FuzzParam(&get<3>(*p), fuzzer) && - FuzzParam(&get<4>(*p), fuzzer); + FuzzParam(&base::get<0>(*p), fuzzer) && + FuzzParam(&base::get<1>(*p), fuzzer) && + FuzzParam(&base::get<2>(*p), fuzzer) && + FuzzParam(&base::get<3>(*p), fuzzer) && + FuzzParam(&base::get<4>(*p), fuzzer); } }; @@ -2053,12 +2053,13 @@ struct FuzzTraits<webrtc::MouseCursor> { #define MAX_FAKE_ROUTING_ID 15 #define IPC_MEMBERS_IN_0(p) -#define IPC_MEMBERS_IN_1(p) get<0>(p) -#define IPC_MEMBERS_IN_2(p) get<0>(p), get<1>(p) -#define IPC_MEMBERS_IN_3(p) get<0>(p), get<1>(p), get<2>(p) -#define IPC_MEMBERS_IN_4(p) get<0>(p), get<1>(p), get<2>(p), get<3>(p) -#define IPC_MEMBERS_IN_5(p) get<0>(p), get<1>(p), get<2>(p), get<3>(p), \ - get<4>(p) +#define IPC_MEMBERS_IN_1(p) base::get<0>(p) +#define IPC_MEMBERS_IN_2(p) base::get<0>(p), base::get<1>(p) +#define IPC_MEMBERS_IN_3(p) base::get<0>(p), base::get<1>(p), base::get<2>(p) +#define IPC_MEMBERS_IN_4(p) base::get<0>(p), base::get<1>(p), base::get<2>(p), \ + base::get<3>(p) +#define IPC_MEMBERS_IN_5(p) base::get<0>(p), base::get<1>(p), base::get<2>(p), \ + base::get<3>(p), base::get<4>(p) #define IPC_MEMBERS_OUT_0() #define IPC_MEMBERS_OUT_1() NULL |