fix namespace v2

Summary: Signed-off-by: Nicholas Ormrod <njormrod@fb.com>

Test Plan:
fbconfig -r folly && fbmake runtests

Reviewed By: yfeldblum@fb.com

Subscribers: fugalh, folly-diffs@, jsedgwick, yfeldblum, chalfant

FB internal diff: D2043151

Tasks: 6783581

folly/experimental/fibers/test/main.cpp

@@ -23,7 +23,7 @@ namespace google { using namespace gflags; }
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   auto rc = RUN_ALL_TESTS();
   folly::runBenchmarksOnFlag();

folly/experimental/test/StringKeyedTest.cpp

@@ -503,7 +503,7 @@ int main(int argc, char **argv) {
   FLAGS_logtostderr = true;
   google::InitGoogleLogging(argv[0]);
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   return RUN_ALL_TESTS();
 }

folly/futures/test/main.cpp

@@ -16,9 +16,10 @@
 
 #include <gtest/gtest.h>
 #include <gflags/gflags.h>
+#include <folly/Portability.h>
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
-  ::google::ParseCommandLineFlags(&argc, &argv, true);
+  ::gflags::ParseCommandLineFlags(&argc, &argv, true);
   return RUN_ALL_TESTS();
 }

folly/io/test/ShutdownSocketSetTest.cpp

@@ -226,6 +226,6 @@ TEST(ShutdownSocketSetTest, AbortiveKill) {
 
 int main(int argc, char *argv[]) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   return RUN_ALL_TESTS();
 }

folly/test/SingletonTest.cpp

@@ -531,7 +531,7 @@ BENCHMARK_RELATIVE(FollySingletonWeak, n) {
 int main(int argc, char* argv[]) {
   testing::InitGoogleTest(&argc, argv);
   google::InitGoogleLogging(argv[0]);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   SingletonVault::singleton()->registrationComplete();
 

folly/test/StringBenchmark.cpp

@@ -48,7 +48,7 @@ BENCHMARK(folly_toLowerAscii, iters) {
 }
 
 int main(int argc, char** argv) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   folly::runBenchmarks();
   if (FLAGS_benchmark) {
     folly::runBenchmarks();

folly/wangle/service/ServiceTest.cpp

@@ -205,7 +205,7 @@ TEST(Wangle, SuperComplexFilterTest) {
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
   google::InitGoogleLogging(argv[0]);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   return RUN_ALL_TESTS();
 }