Make base compile with no "using base::FilePath".

base/nix/mime_util_xdg.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 "base/nix/mime_util_xdg.h"
 
 #include <cstdlib>
 #include <list>
 #include <map>
 #include <vector>
@@ skipping 11 matching lines @@
 #include "base/third_party/xdg_mime/xdgmime.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>  // NOLINT
 
 #include "base/message_loop.h"
 #endif
 
+namespace base {
+namespace nix {
+
 namespace {
 
 class IconTheme;
 
 // None of the XDG stuff is thread-safe, so serialize all access under
 // this lock.
 base::LazyInstance<base::Lock>::Leaky
     g_mime_util_xdg_lock = LAZY_INSTANCE_INITIALIZER;
 
 class MimeUtilConstants {
@@ skipping 464 matching lines @@
 
 // Initialize the list of default themes.
 void InitDefaultThemes() {
   IconTheme** default_themes =
       MimeUtilConstants::GetInstance()->default_themes_;
 
   scoped_ptr<base::Environment> env(base::Environment::Create());
   base::nix::DesktopEnvironment desktop_env =
       base::nix::GetDesktopEnvironment(env.get());
   if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE3 ||
       desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE4) {

[jar (doing other things), 2013/02/13 03:15:56]

nit: perhaps the base::nix on the above 4 lines, and down on line 529, should go
away now.

Also, I was a little scared about inadvertent use of these namespace qualifiers
in the other mentioned functions here.

Is there a nice way to be sure the change is safe? (pushing all this into the
base::nix namespace)

[brettw, 2013/02/13 20:45:34]

I'll fix the extra "base::" and do a new patch. I had to revert this because I
messed up something on Windows.

     // KDE
     std::string kde_default_theme;
     std::string kde_fallback_theme;
 
     // TODO(thestig): Figure out how to get the current icon theme on KDE.
     // Setting stored in ~/.kde/share/config/kdeglobals under Icons -> Theme.
     default_themes[0] = NULL;
 
     // Try some reasonable defaults for KDE.
     if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE3) {
@@ skipping 49 matching lines @@
   return LookupFallbackIcon(icon_name);
 }
 
 MimeUtilConstants::~MimeUtilConstants() {
   for (size_t i = 0; i < kDefaultThemeNum; i++)
     delete default_themes_[i];
 }
 
 }  // namespace
 
-namespace base {
-namespace nix {
-
 std::string GetFileMimeType(const FilePath& filepath) {
   if (filepath.empty())
     return std::string();
   base::ThreadRestrictions::AssertIOAllowed();
   base::AutoLock scoped_lock(g_mime_util_xdg_lock.Get());
   return xdg_mime_get_mime_type_from_file_name(filepath.value().c_str());
 }
 
 std::string GetDataMimeType(const std::string& data) {
   base::ThreadRestrictions::AssertIOAllowed();
@@ skipping 69 matching lines @@
       icon_file = LookupIconInDefaultTheme(icon_names[i], size);
       if (!icon_file.empty())
         return icon_file;
     }
   }
   return FilePath();
 }
 
 }  // namespace nix
 }  // namespace base