Cleanup: Break another common->app dependency.

chrome/app/chrome_dll_main.cc

 // Copyright (c) 2010 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.
 
 // TODO(port): the ifdefs in here are a first step towards trying to determine
 // the correct abstraction for all the OS functionality required at this
 // stage of process initialization. It should not be taken as a final
 // abstraction.
 
 #include "build/build_config.h"
@@ skipping 30 matching lines @@
 #include "base/file_version_info.h"
 #include "base/i18n/icu_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/scoped_nsautorelease_pool.h"
 #include "base/stats_counters.h"
 #include "base/stats_table.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/app/chrome_version_info.h"
 #include "chrome/browser/diagnostics/diagnostics_main.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_counters.h"
 #include "chrome/common/chrome_descriptors.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/common/sandbox_init_wrapper.h"
 #include "chrome/common/url_constants.h"
 #include "ipc/ipc_switches.h"
 
 #if defined(USE_NSS)
 #include "base/nss_util.h"
 #endif
 
@@ skipping 432 matching lines @@
 #if defined(OS_WIN)
   CommandLine::Init(0, NULL);
 #else
   CommandLine::Init(argc, argv);
 #endif
 
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   if (parsed_command_line.HasSwitch(switches::kProductVersion)) {
-    scoped_ptr<FileVersionInfo> version(chrome_app::GetChromeVersionInfo());
+    scoped_ptr<FileVersionInfo> version(chrome::GetChromeVersionInfo());
     printf("%s\n", WideToASCII(version->product_version()).c_str());
     return 0;
   }
 #endif
 
 #if defined(OS_POSIX)
   if (parsed_command_line.HasSwitch(switches::kVersion)) {
-    scoped_ptr<FileVersionInfo> version(chrome_app::GetChromeVersionInfo());
+    scoped_ptr<FileVersionInfo> version(chrome::GetChromeVersionInfo());
     printf("%s %s %s\n",
            WideToUTF8(version->product_name()).c_str(),
            WideToASCII(version->product_version()).c_str(),
            UTF16ToUTF8(platform_util::GetVersionStringModifier()).c_str());
     return 0;
   }
 #endif
 
   std::string process_type =
       parsed_command_line.GetSwitchValueASCII(switches::kProcessType);
@@ skipping 373 matching lines @@
 
   logging::CleanupChromeLogging();
 
 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD)
   // TODO(mark): See the TODO(mark) above at InitCrashReporter.
   DestructCrashReporter();
 #endif  // OS_MACOSX && GOOGLE_CHROME_BUILD
 
   return rv;
 }