Make callers of CommandLine use it via the base:: namespace.

chrome/browser/ui/libgtk2ui/gtk2_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/browser/ui/libgtk2ui/gtk2_util.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "base/environment.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #include "ui/gfx/size.h"
 
 namespace {
 
 const char kAuraTransientParent[] = "aura-transient-parent";
 
-void CommonInitFromCommandLine(const CommandLine& command_line,
+void CommonInitFromCommandLine(const base::CommandLine& command_line,
                                void (*init_func)(gint*, gchar***)) {
   const std::vector<std::string>& args = command_line.argv();
   int argc = args.size();
   scoped_ptr<char *[]> argv(new char *[argc + 1]);
   for (size_t i = 0; i < args.size(); ++i) {
     // TODO(piman@google.com): can gtk_init modify argv? Just being safe
     // here.
     argv[i] = strdup(args[i].c_str());
   }
   argv[argc] = NULL;
   char **argv_pointer = argv.get();
 
   {
     // http://crbug.com/423873
     ANNOTATE_SCOPED_MEMORY_LEAK;
     init_func(&argc, &argv_pointer);
   }
   for (size_t i = 0; i < args.size(); ++i) {
     free(argv[i]);
   }
 }
 
 }  // namespace
 
 namespace libgtk2ui {
 
-void GtkInitFromCommandLine(const CommandLine& command_line) {
+void GtkInitFromCommandLine(const base::CommandLine& command_line) {
   CommonInitFromCommandLine(command_line, gtk_init);
 }
 
 // TODO(erg): This method was copied out of shell_integration_linux.cc. Because
 // of how this library is structured as a stand alone .so, we can't call code
 // from browser and above.
 std::string GetDesktopName(base::Environment* env) {
 #if defined(GOOGLE_CHROME_BUILD)
   return "google-chrome.desktop";
 #else  // CHROMIUM_BUILD
@@ skipping 76 matching lines @@
     case ui::NativeTheme::kDisabled:  return GTK_STATE_INSENSITIVE;
     case ui::NativeTheme::kHovered:   return GTK_STATE_PRELIGHT;
     case ui::NativeTheme::kNormal:    return GTK_STATE_NORMAL;
     case ui::NativeTheme::kPressed:   return GTK_STATE_ACTIVE;
     case ui::NativeTheme::kNumStates: NOTREACHED();
   }
   return GTK_STATE_NORMAL;
 }
 
 }  // namespace libgtk2ui