Update uses of UTF conversions in courgette/, device/, extensions/, google_apis/, gpu/, ipc/, media…

extensions/browser/management_policy_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 "base/strings/utf_string_conversions.h"
 #include "extensions/browser/management_policy.h"
 #include "extensions/browser/test_management_policy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 typedef extensions::TestManagementPolicyProvider TestProvider;
@@ skipping 162 matching lines @@
   policy_.UnregisterProvider(&must_remain_disabled_);
   error.clear();
   EXPECT_FALSE(policy_.MustRemainDisabled(NULL, NULL, &error));
   EXPECT_TRUE(error.empty());
 }
 
 // Tests error handling in the ManagementPolicy.
 TEST_F(ManagementPolicyTest, ErrorHandling) {
   // The error parameter should be unchanged if no restriction was found.
   std::string original_error = "Ceci est en effet une erreur.";
-  base::string16 original_error16 = UTF8ToUTF16(original_error);
+  base::string16 original_error16 = base::UTF8ToUTF16(original_error);
   base::string16 error = original_error16;
   EXPECT_TRUE(policy_.UserMayLoad(NULL, &error));
-  EXPECT_EQ(original_error, UTF16ToUTF8(error));
+  EXPECT_EQ(original_error, base::UTF16ToUTF8(error));
   EXPECT_TRUE(policy_.UserMayModifySettings(NULL, &error));
-  EXPECT_EQ(original_error, UTF16ToUTF8(error));
+  EXPECT_EQ(original_error, base::UTF16ToUTF8(error));
   EXPECT_FALSE(policy_.MustRemainEnabled(NULL, &error));
-  EXPECT_EQ(original_error, UTF16ToUTF8(error));
+  EXPECT_EQ(original_error, base::UTF16ToUTF8(error));
 
   // Ensure no crashes if no error message was requested.
   EXPECT_TRUE(policy_.UserMayLoad(NULL, NULL));
   EXPECT_TRUE(policy_.UserMayModifySettings(NULL, NULL));
   EXPECT_FALSE(policy_.MustRemainEnabled(NULL, NULL));
   policy_.RegisterProvider(&restrict_all_);
   EXPECT_FALSE(policy_.UserMayLoad(NULL, NULL));
   EXPECT_FALSE(policy_.UserMayModifySettings(NULL, NULL));
   EXPECT_TRUE(policy_.MustRemainEnabled(NULL, NULL));
 
   // Make sure returned error is correct.
   error = original_error16;
   EXPECT_FALSE(policy_.UserMayLoad(NULL, &error));
-  EXPECT_EQ(UTF8ToUTF16(TestProvider::expected_error()), error);
+  EXPECT_EQ(base::UTF8ToUTF16(TestProvider::expected_error()), error);
   error = original_error16;
   EXPECT_FALSE(policy_.UserMayModifySettings(NULL, &error));
-  EXPECT_EQ(UTF8ToUTF16(TestProvider::expected_error()), error);
+  EXPECT_EQ(base::UTF8ToUTF16(TestProvider::expected_error()), error);
   error = original_error16;
   EXPECT_TRUE(policy_.MustRemainEnabled(NULL, &error));
-  EXPECT_EQ(UTF8ToUTF16(TestProvider::expected_error()), error);
+  EXPECT_EQ(base::UTF8ToUTF16(TestProvider::expected_error()), error);
 }