Use base::StartWith() in more places when appropriate.

extensions/common/extension_l10n_util.cc

 // Copyright 2014 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/extension_l10n_util.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
+#include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/file_util.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/message_bundle.h"
 #include "third_party/icu/source/common/unicode/uloc.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 234 matching lines @@
                        base::DictionaryValue* manifest,
                        std::string* error) {
   DCHECK(manifest);
 
   std::string default_locale = GetDefaultLocaleFromManifest(*manifest, error);
 
   std::unique_ptr<extensions::MessageBundle> message_bundle(
       extensions::file_util::LoadMessageBundle(extension_path, default_locale,
                                                error));
 
-  if (!message_bundle.get() && !error->empty())
+  if (!message_bundle && !error->empty())
     return false;
 
-  if (message_bundle.get() &&
-      !LocalizeManifest(*message_bundle, manifest, error))
+  if (message_bundle && !LocalizeManifest(*message_bundle, manifest, error))
     return false;
 
   return true;
 }
 
 bool AddLocale(const std::set<std::string>& chrome_locales,
                const base::FilePath& locale_folder,
                const std::string& locale_name,
                std::set<std::string>* valid_locales,
                std::string* error) {
   // Accept name that starts with a . but don't add it to the list of supported
   // locales.
-  if (locale_name.find(".") == 0)
+  if (base::StartsWith(locale_name, ".", base::CompareCase::SENSITIVE))
     return true;
   if (chrome_locales.find(locale_name) == chrome_locales.end()) {
     // Warn if there is an extension locale that's not in the Chrome list,
     // but don't fail.
     DLOG(WARNING) << base::StringPrintf("Supplied locale %s is not supported.",
                                         locale_name.c_str());
     return true;
   }
   // Check if messages file is actually present (but don't check content).
-  if (base::PathExists(locale_folder.Append(extensions::kMessagesFilename))) {
-    valid_locales->insert(locale_name);
-  } else {
+  if (!base::PathExists(locale_folder.Append(extensions::kMessagesFilename))) {
     *error = base::StringPrintf("Catalog file is missing for locale %s.",
                                 locale_name.c_str());
     return false;
   }
 
+  valid_locales->insert(locale_name);
   return true;
 }
 
 std::string CurrentLocaleOrDefault() {
   std::string current_locale = l10n_util::NormalizeLocale(GetProcessLocale());
   if (current_locale.empty())
     current_locale = "en";
 
   return current_locale;
 }
@@ skipping 141 matching lines @@
 ScopedLocaleForTest::ScopedLocaleForTest(const std::string& locale)
     : locale_(extension_l10n_util::CurrentLocaleOrDefault()) {
   extension_l10n_util::SetProcessLocale(locale);
 }
 
 ScopedLocaleForTest::~ScopedLocaleForTest() {
   extension_l10n_util::SetProcessLocale(locale_);
 }
 
 }  // namespace extension_l10n_util