Samples changes upstreaming

googletest/samples/sample10_unittest.cc

@@ -34,8 +34,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "gtest/gtest.h"
-namespace {
+#include "third_party/gtest/include/gtest/gtest.h"
 using ::testing::EmptyTestEventListener;
 using ::testing::InitGoogleTest;
 using ::testing::Test;
@@ -46,7 +45,6 @@ using ::testing::TestPartResult;
 using ::testing::UnitTest;
 
 namespace {
-
 // We will track memory used by this class.
 class Water {
  public:
@@ -106,7 +104,6 @@ TEST(ListenersTest, LeaksWater) {
   Water* water = new Water;
   EXPECT_TRUE(water != NULL);
 }
-
 }  // namespace
 
 int main(int argc, char **argv) {
@@ -142,4 +139,3 @@ int main(int argc, char **argv) {
   }
   return RUN_ALL_TESTS();
 }
-}  // namespace