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

extensions/common/manifest_handlers/incognito_info.cc

 // Copyright (c) 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 "extensions/common/manifest_handlers/incognito_info.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "extensions/common/extension.h"
@@ skipping 30 matching lines @@
     extension->SetManifestData(
         keys::kIncognito,
         new IncognitoInfo(extension->is_hosted_app() ||
                           extension->is_legacy_packaged_app()));
     return true;
   }
 
   bool split_mode = false;
   std::string incognito_string;
   if (!extension->manifest()->GetString(keys::kIncognito, &incognito_string)) {
-    *error = ASCIIToUTF16(manifest_errors::kInvalidIncognitoBehavior);
+    *error = base::ASCIIToUTF16(manifest_errors::kInvalidIncognitoBehavior);
     return false;
   }
 
   if (incognito_string == manifest_values::kIncognitoSplit)
     split_mode = true;
   else if (incognito_string != manifest_values::kIncognitoSpanning) {
     // If incognito_string == kIncognitoSpanning, it is valid and
     // split_mode remains false.
-    *error = ASCIIToUTF16(manifest_errors::kInvalidIncognitoBehavior);
+    *error = base::ASCIIToUTF16(manifest_errors::kInvalidIncognitoBehavior);
     return false;
   }
 
   extension->SetManifestData(keys::kIncognito, new IncognitoInfo(split_mode));
   return true;
 }
 
 bool IncognitoHandler::AlwaysParseForType(Manifest::Type type) const {
   return true;
 }
 
 const std::vector<std::string> IncognitoHandler::Keys() const {
   return SingleKey(keys::kIncognito);
 }
 
 }  // namespace extensions