Cleanup: Break another common->app dependency.

chrome/browser/diagnostics/recon_diagnostics.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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/diagnostics/recon_diagnostics.h"
 
+#include <string>
+
 #include "app/app_paths.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/json/json_reader.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/path_service.h"
-#include "chrome/app/chrome_version_info.h"
 #include "chrome/browser/diagnostics/diagnostics_test.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/json_value_serializer.h"
 
 #if defined(OS_WIN)
 #include "base/win_util.h"
 #include "chrome/installer/util/install_util.h"
 #endif
 
 // Reconnaissance diagnostics. These are the first and most critical
 // diagnostic tests. Here we check for the existence of critical files.
 // TODO(cpu): Define if it makes sense to localize strings.
@@ skipping 79 matching lines @@
 
 // Check the version of Chrome.
 class VersionTest : public DiagnosticTest {
  public:
   VersionTest() : DiagnosticTest(ASCIIToUTF16("Browser Version")) {}
 
   virtual int GetId() { return 0; }
 
   virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) {
     scoped_ptr<FileVersionInfo> version_info(
-        chrome_app::GetChromeVersionInfo());
+        chrome::GetChromeVersionInfo());
     if (!version_info.get()) {
       RecordFailure(ASCIIToUTF16("No Version"));
       return true;
     }
     string16 current_version = WideToUTF16(version_info->file_version());
     if (current_version.empty()) {
       RecordFailure(ASCIIToUTF16("Empty Version"));
       return true;
     }
     string16 version_modifier = platform_util::GetVersionStringModifier();
@@ skipping 226 matching lines @@
   path = path.Append(chrome::kBookmarksFileName);
   return new JSONTest(path, ASCIIToUTF16("BookMarks JSON"), 2 * kOneMeg);
 }
 
 DiagnosticTest* MakeLocalStateTest() {
   FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
   path = path.Append(chrome::kLocalStateFilename);
   return new JSONTest(path, ASCIIToUTF16("Local State JSON"), 50 * kOneKilo);
 }