Move JoinString to the base namespace

remoting/base/capabilities_unittest.cc

 // Copyright 2013 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.
 
 #include <algorithm>
 #include <vector>
 
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "remoting/base/capabilities.h"
@@ skipping 49 matching lines @@
   };
 
   // Verify that HasCapability(|capabilities|, |key|) returns |result|.
   // |result|.
   for (size_t i = 0; i < arraysize(data); ++i) {
     std::vector<std::string> caps = base::SplitString(
         data[i].capabilities, " ", base::KEEP_WHITESPACE,
         base::SPLIT_WANT_NONEMPTY);
     do {
       EXPECT_EQ(data[i].result,
-                HasCapability(JoinString(caps, " "), data[i].key));
+                HasCapability(base::JoinString(caps, " "), data[i].key));
     } while (std::next_permutation(caps.begin(), caps.end()));
   }
 }
 
 TEST(CapabilitiesTest, Intersect) {
   EXPECT_EQ(IntersectCapabilities("a", "a"), "a");
 
   IntersectTestData data[] = {
     { "", "", "" },
     { "a", "", "" },
@@ skipping 10 matching lines @@
     { "a b c", "z", "" }
   };
 
   // Verify that intersection of |right| with all permutations of |left| yields
   // |result|.
   for (size_t i = 0; i < arraysize(data); ++i) {
     std::vector<std::string> caps = base::SplitString(
         data[i].left, " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
     do {
       EXPECT_EQ(data[i].result,
-                IntersectCapabilities(JoinString(caps, " "), data[i].right));
+                IntersectCapabilities(base::JoinString(caps, " "),
+                                      data[i].right));
     } while (std::next_permutation(caps.begin(), caps.end()));
   }
 }
 
 }  // namespace remoting