Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the hea…

chrome/common/service_process_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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
@@ skipping 49 matching lines @@
   // us reading bogus data from shared memory for an app that has died.
   if (!CheckServiceProcessReady()) {
     return SERVICE_NOT_RUNNING;
   }
 #endif  // defined(OS_POSIX)
 
   // At this time we have a version string. Set the out param if it exists.
   if (service_version_out)
     *service_version_out = version;
 
-  base::Version service_version(version);
+  Version service_version(version);
   // If the version string is invalid, treat it like an older version.
   if (!service_version.IsValid())
     return SERVICE_OLDER_VERSION_RUNNING;
 
   // Get the version of the currently *running* instance of Chrome.
   chrome::VersionInfo version_info;
   if (!version_info.is_valid()) {
     NOTREACHED() << "Failed to get current file version";
     // Our own version is invalid. This is an error case. Pretend that we
     // are out of date.
     return SERVICE_NEWER_VERSION_RUNNING;
   }
-  base::Version running_version(version_info.Version());
+  Version running_version(version_info.Version());
   if (!running_version.IsValid()) {
     NOTREACHED() << "Failed to parse version info";
     // Our own version is invalid. This is an error case. Pretend that we
     // are out of date.
     return SERVICE_NEWER_VERSION_RUNNING;
   }
 
   if (running_version.CompareTo(service_version) > 0) {
     return SERVICE_OLDER_VERSION_RUNNING;
   } else if (service_version.CompareTo(running_version) > 0) {
@@ skipping 163 matching lines @@
 
   // The user data directory is the only other flag we currently want to
   // possibly store.
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   base::FilePath user_data_dir =
     browser_command_line.GetSwitchValuePath(switches::kUserDataDir);
   if (!user_data_dir.empty())
     autorun_command_line_->AppendSwitchPath(switches::kUserDataDir,
                                             user_data_dir);
 }