Move/Copy paths used by app to app_paths.

app/l10n_util_unittest.cc

 // Copyright (c) 2006-2008 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 "build/build_config.h"
 
+#include "app/app_paths.h"
 #include "app/l10n_util.h"
 #if !defined(OS_MACOSX)
 #include "app/test/data/resource.h"
 #endif
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #if defined(OS_WIN)
 #include "base/win_util.h"
 #endif
-#include "chrome/common/chrome_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "unicode/locid.h"
 
 namespace {
 
 class StringWrapper {
  public:
   explicit StringWrapper(const std::wstring& string) : string_(string) {}
   const std::wstring& string() const { return string_; }
@@ skipping 63 matching lines @@
 #if defined(OS_WIN) || defined(OS_LINUX)
 // We are disabling this test on MacOS because GetApplicationLocale() as an
 // API isn't something that we'll easily be able to unit test in this manner.
 // The meaning of that API, on the Mac, is "the locale used by Cocoa's main
 // nib file", which clearly can't be stubbed by a test app that doesn't use
 // Cocoa.
 TEST_F(L10nUtilTest, GetAppLocale) {
   // Use a temporary locale dir so we don't have to actually build the locale
   // dlls for this test.
   FilePath orig_locale_dir;
-  PathService::Get(chrome::DIR_LOCALES, &orig_locale_dir);
+  PathService::Get(app::DIR_LOCALES, &orig_locale_dir);
   FilePath new_locale_dir;
   EXPECT_TRUE(file_util::CreateNewTempDirectory(
       FILE_PATH_LITERAL("l10n_util_test"),
       &new_locale_dir));
-  PathService::Override(chrome::DIR_LOCALES, new_locale_dir.ToWStringHack());
+  PathService::Override(app::DIR_LOCALES, new_locale_dir.ToWStringHack());
   // Make fake locale files.
   std::string filenames[] = {
     "en-US",
     "en-GB",
     "fr",
     "es-419",
     "es",
     "zh-TW",
     "zh-CN",
     "he",
@@ skipping 78 matching lines @@
     EXPECT_EQ(L"en-GB", l10n_util::GetApplicationLocale(L"or"));
   } else {
     SetICUDefaultLocale(L"or");
     EXPECT_EQ(L"or", l10n_util::GetApplicationLocale(L""));
     SetICUDefaultLocale(L"en-GB");
     EXPECT_EQ(L"or", l10n_util::GetApplicationLocale(L"or"));
   }
 #endif
 
   // Clean up.
-  PathService::Override(chrome::DIR_LOCALES, orig_locale_dir.ToWStringHack());
+  PathService::Override(app::DIR_LOCALES, orig_locale_dir.ToWStringHack());
   file_util::Delete(new_locale_dir, true);
   UErrorCode error_code = U_ZERO_ERROR;
   Locale::setDefault(locale, error_code);
 }
 #endif
 
 TEST_F(L10nUtilTest, SortStringsUsingFunction) {
   std::vector<StringWrapper*> strings;
   strings.push_back(new StringWrapper(L"C"));
   strings.push_back(new StringWrapper(L"d"));
@@ skipping 208 matching lines @@
   EXPECT_EQ(l10n_util::LEFT_TO_RIGHT, GetTextDirection("en"));
   // Chinese in China with '-'.
   EXPECT_EQ(l10n_util::LEFT_TO_RIGHT, GetTextDirection("zh-CN"));
   // Filipino : 3-letter code
   EXPECT_EQ(l10n_util::LEFT_TO_RIGHT, GetTextDirection("fil"));
   // Russian
   EXPECT_EQ(l10n_util::LEFT_TO_RIGHT, GetTextDirection("ru"));
   // Japanese that uses multiple scripts
   EXPECT_EQ(l10n_util::LEFT_TO_RIGHT, GetTextDirection("ja"));
 }