Cleanup: Break another common->app dependency.

chrome/browser/upgrade_detector.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.
 
 #include "chrome/browser/upgrade_detector.h"
 
+#include <string>
+
 #include "base/command_line.h"
 #include "base/file_version_info.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
-#include "chrome/app/chrome_version_info.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/browser_distribution.h"
 
 #if defined(OS_WIN)
 #include "chrome/installer/util/install_util.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/cocoa/keystone_glue.h"
 #elif defined(OS_POSIX)
@@ skipping 69 matching lines @@
     std::string reply;
     if (!base::GetAppOutput(command_line, &reply)) {
       DLOG(ERROR) << "Failed to get current file version";
       return;
     }
 
     installed_version.reset(Version::GetVersionFromString(ASCIIToUTF16(reply)));
 #endif
 
     // Get the version of the currently *running* instance of Chrome.
-    scoped_ptr<FileVersionInfo> version(chrome_app::GetChromeVersionInfo());
+    scoped_ptr<FileVersionInfo> version(chrome::GetChromeVersionInfo());
     if (version.get() == NULL) {
       NOTREACHED() << "Failed to get current file version";
       return;
     }
 
     scoped_ptr<Version> running_version(
         Version::GetVersionFromString(WideToUTF16(version->file_version())));
     if (running_version.get() == NULL) {
       NOTREACHED() << "Failed to parse version info";
       return;
@@ skipping 68 matching lines @@
 }
 
 void UpgradeDetector::NotifyOnUpgrade() {
   notify_upgrade_ = true;
 
   NotificationService::current()->Notify(
       NotificationType::UPGRADE_RECOMMENDED,
       Source<UpgradeDetector>(this),
       NotificationService::NoDetails());
 }