Cleanup: Break another common->app dependency.

chrome/test/automation/automation_proxy.cc

-// Copyright (c) 2006-2008 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/test/automation/automation_proxy.h"
 
+#include <gtest/gtest.h>
+
 #include <sstream>
 
 #include "base/basictypes.h"
 #include "base/file_version_info.h"
 #include "base/logging.h"
 #include "base/platform_thread.h"
 #include "base/process_util.h"
 #include "base/ref_counted.h"
 #include "base/waitable_event.h"
-#include "chrome/app/chrome_version_info.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chrome/test/automation/automation_constants.h"
 #include "chrome/test/automation/automation_messages.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/extension_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
-#include <gtest/gtest.h>
 #include "ipc/ipc_descriptors.h"
 #if defined(OS_WIN)
 // TODO(port): Enable when dialog_delegate is ported.
 #include "views/window/dialog_delegate.h"
 #endif
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 namespace {
@@ skipping 133 matching lines @@
   tracker_.reset(new AutomationHandleTracker());
 }
 
 AutomationLaunchResult AutomationProxy::WaitForAppLaunch() {
   AutomationLaunchResult result = AUTOMATION_SUCCESS;
   if (app_launched_.TimedWait(command_execution_timeout_)) {
     if (perform_version_check_) {
       // Obtain our own version number and compare it to what the automation
       // provider sent.
       scoped_ptr<FileVersionInfo> file_version_info(
-          chrome_app::GetChromeVersionInfo());
+          chrome::GetChromeVersionInfo());
       DCHECK(file_version_info != NULL);
       std::string version_string(
           WideToASCII(file_version_info->file_version()));
 
       // Note that we use a simple string comparison since we expect the version
       // to be a punctuated numeric string. Consider using base/Version if we
       // ever need something more complicated here.
       if (server_version_ != version_string) {
         result = AUTOMATION_VERSION_MISMATCH;
       }
@@ skipping 340 matching lines @@
                                                           password,
                                                           &success));
   // If message sending unsuccessful or test failed, return false.
   return sent && success;
 }
 #endif
 
 bool AutomationProxy::ResetToDefaultTheme() {
   return Send(new AutomationMsg_ResetToDefaultTheme(0));
 }