Move the rest of extension_manifest_constants to top-level extensions/

chrome/common/extensions/extension_l10n_util.cc

 // Copyright (c) 2012 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 "chrome/common/extensions/extension_l10n_util.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension_file_util.h"
-#include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/message_bundle.h"
 #include "chrome/common/url_constants.h"
 #include "extensions/common/constants.h"
+#include "extensions/common/manifest_constants.h"
 #include "third_party/icu/source/common/unicode/uloc.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace errors = extension_manifest_errors;
+namespace errors = extensions::manifest_errors;
 namespace keys = extensions::manifest_keys;
 
 static std::string& GetProcessLocale() {
   CR_DEFINE_STATIC_LOCAL(std::string, locale, ());
   return locale;
 }
 
 namespace extension_l10n_util {
 
 void SetProcessLocale(const std::string& locale) {
@@ skipping 246 matching lines @@
     if (!AddLocale(chrome_locales,
                    locale_folder,
                    locale_name,
                    valid_locales,
                    error)) {
       return false;
     }
   }
 
   if (valid_locales->empty()) {
-    *error = extension_manifest_errors::kLocalesNoValidLocaleNamesListed;
+    *error = extensions::manifest_errors::kLocalesNoValidLocaleNamesListed;
     return false;
   }
 
   return true;
 }
 
 // Loads contents of the messages file for given locale. If file is not found,
 // or there was parsing error we return NULL and set |error|.
 // Caller owns the returned object.
 static base::DictionaryValue* LoadMessageFile(
@@ skipping 74 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