Add chrome.loadAsync capability to ChromeDriver, which allows the user not to

chrome/test/webdriver/automation.cc

 // Copyright (c) 2011 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/webdriver/automation.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include "base/base_paths.h"
+#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
+#include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/automation_json_requests.h"
 #include "chrome/test/automation/automation_proxy.h"
+#include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/extension_proxy.h"
 #include "chrome/test/automation/proxy_launcher.h"
+#include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/webdriver/frame_path.h"
 #include "chrome/test/webdriver/webdriver_error.h"
 #include "ui/gfx/point.h"
 
 #if defined(OS_WIN)
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #endif
 
 namespace {
 
 // Gets the path to the default Chrome executable. Returns true on success.
 bool GetDefaultChromeExe(FilePath* browser_exe) {
+  // Instead of using chrome constants, we hardcode these constants here so
+  // that we can locate chrome or chromium regardless of the branding
+  // chromedriver is built with. It may be argued that then we need to keep
+  // these in sync with chrome constants. However, if chrome constants changes,
+  // we need to look for the previous and new versions to support some
+  // backwards compatibility.
+#if defined(OS_WIN)
+  FilePath browser_exes[] = {
+      FilePath(L"chrome.exe")
+  };
+#elif defined(OS_MACOSX)
+  FilePath browser_exes[] = {
+      FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"),
+      FilePath("Chromium.app/Contents/MacOS/Chromium")
+  };
+#elif defined(OS_LINUX)
+  FilePath browser_exes[] = {
+      FilePath("google-chrome"),
+      FilePath("chrome"),
+      FilePath("chromium"),
+      FilePath("chromium-browser")
+  };
+#endif
+
+  // Check the directory which this module resides in.
+  FilePath module_dir;
+  if (PathService::Get(base::DIR_MODULE, &module_dir)) {
+    for (size_t j = 0; j < arraysize(browser_exes); ++j) {
+      FilePath path = module_dir.Append(browser_exes[j]);
+      if (file_util::PathExists(path)) {
+        *browser_exe = path;
+        return true;
+      }
+    }
+  }
+
   std::vector<FilePath> locations;
-  // Add the directory which this module resides in.
-  FilePath module_dir;
-  if (PathService::Get(base::DIR_MODULE, &module_dir))
-    locations.push_back(module_dir);
-
+  std::vector<FilePath> chromium_locations;
 #if defined(OS_WIN)
   // Add the App Paths registry key location.
   const wchar_t kSubKey[] =
       L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\chrome.exe";
   base::win::RegKey key(HKEY_CURRENT_USER, kSubKey, KEY_READ);
   std::wstring path;
   if (key.ReadValue(L"path", &path) == ERROR_SUCCESS)
     locations.push_back(FilePath(path));
   base::win::RegKey sys_key(HKEY_LOCAL_MACHINE, kSubKey, KEY_READ);
   if (sys_key.ReadValue(L"path", &path) == ERROR_SUCCESS)
     locations.push_back(FilePath(path));
 
   // Add the user-level location for Chrome.
   FilePath app_from_google(L"Google\\Chrome\\Application");
+  FilePath app_from_chromium(L"Chromium\\Application");
   scoped_ptr<base::Environment> env(base::Environment::Create());
   std::string home_dir;
   if (env->GetVar("userprofile", &home_dir)) {
     FilePath default_location(UTF8ToWide(home_dir));
     if (base::win::GetVersion() < base::win::VERSION_VISTA) {
       default_location = default_location.Append(
           L"Local Settings\\Application Data");
     } else {
       default_location = default_location.Append(L"AppData\\Local");
     }
     locations.push_back(default_location.Append(app_from_google));
+    chromium_locations.push_back(default_location.Append(app_from_chromium));
   }
 
   // Add the system-level location for Chrome.
   std::string program_dir;
   if (env->GetVar("ProgramFiles", &program_dir)) {
     locations.push_back(FilePath(UTF8ToWide(program_dir))
         .Append(app_from_google));
+    chromium_locations.push_back(FilePath(UTF8ToWide(program_dir))
+        .Append(app_from_chromium));
   }
   if (env->GetVar("ProgramFiles(x86)", &program_dir)) {
     locations.push_back(FilePath(UTF8ToWide(program_dir))
         .Append(app_from_google));
+    chromium_locations.push_back(FilePath(UTF8ToWide(program_dir))
+        .Append(app_from_chromium));
   }
 #elif defined(OS_MACOSX)
+  locations.push_back(file_util::GetHomeDir().AppendASCII("Applications"));
   locations.push_back(FilePath("/Applications"));
 #elif defined(OS_LINUX)
-  // Proxy launcher doesn't check for google-chrome, only chrome.
-  FilePath chrome_sym_link("/usr/bin/google-chrome");
-  if (file_util::PathExists(chrome_sym_link)) {
-    FilePath chrome;
-    if (file_util::ReadSymbolicLink(chrome_sym_link, &chrome)) {
-      locations.push_back(chrome.DirName());
-    }
-  }
+  locations.push_back(FilePath("/opt/google/chrome"));
+  locations.push_back(FilePath("/usr/local/bin"));
+  locations.push_back(FilePath("/usr/local/sbin"));
+  locations.push_back(FilePath("/usr/bin"));
+  locations.push_back(FilePath("/usr/sbin"));
+  locations.push_back(FilePath("/bin"));
+  locations.push_back(FilePath("/sbin"));
 #endif
 
   // Add the current directory.
   FilePath current_dir;
   if (file_util::GetCurrentDirectory(&current_dir))
     locations.push_back(current_dir);
 
-  // Determine the default directory.
-  for (size_t i = 0; i < locations.size(); ++i) {
-    FilePath path = locations[i].Append(chrome::kBrowserProcessExecutablePath);
-    if (file_util::PathExists(path)) {
-      *browser_exe = path;
-      return true;
+  // Determine the default exe.
+
+  // Loop through the browser executable paths (|browser_exes|). For each
+  // path, see if any of the locations have such a filename.
+  for (size_t j = 0; j < arraysize(browser_exes); ++j) {
+    for (size_t i = 0; i < locations.size(); ++i) {
+      FilePath path = locations[i].Append(browser_exes[j]);
+      if (file_util::PathExists(path)) {
+        *browser_exe = path;
+        return true;
+      }
+    }
+  }
+
+  // Loop through the browser executable paths (|browser_exes|). For each

[Huyen, 2011/08/08 17:53:12]

Code above is similar, maybe move it into a method for reuse?

+  // path, see if any of the chromium locations have such a filename.
+  for (size_t j = 0; j < arraysize(browser_exes); ++j) {
+    for (size_t i = 0; i < chromium_locations.size(); ++i) {
+      FilePath path = chromium_locations[i].Append(browser_exes[j]);
+      if (file_util::PathExists(path)) {
+        *browser_exe = path;
+        return true;
+      }
     }
   }
   return false;
 }
 
 }  // namespace
 
 namespace webdriver {
 
 Automation::Automation() {}
@@ skipping 299 matching lines @@
                                     url, 1, &navigate_response,
                                     &error_msg)) {
     *error = new Error(kUnknownError, error_msg);
     return;
   }
   // TODO(kkania): Do not rely on this enum.
   if (navigate_response == AUTOMATION_MSG_NAVIGATION_ERROR)
     *error = new Error(kUnknownError, "Navigation error occurred");
 }
 
+void Automation::NavigateToURLAsync(int tab_id,
+                                    const std::string& url,
+                                    Error** error) {
+  int windex = 0, tab_index = 0;
+  *error = GetIndicesForTab(tab_id, &windex, &tab_index);
+  if (*error)
+    return;
+
+  scoped_refptr<BrowserProxy> browser = automation()->GetBrowserWindow(windex);
+  if (!browser) {
+    *error = new Error(kUnknownError, "Couldn't obtain browser proxy");
+    return;
+  }
+  scoped_refptr<TabProxy> tab = browser->GetTab(tab_index);
+  if (!tab) {
+    *error = new Error(kUnknownError, "Couldn't obtain tab proxy");
+    return;
+  }
+  if (!tab->NavigateToURLAsync(GURL(url))) {
+    *error = new Error(kUnknownError, "Unable to navigate to url");
+    return;
+  }
+}
+
 void Automation::GoForward(int tab_id, Error** error) {
   int windex = 0, tab_index = 0;
   *error = GetIndicesForTab(tab_id, &windex, &tab_index);
   if (*error)
     return;
 
   std::string error_msg;
   if (!SendGoForwardJSONRequest(
           automation(), windex, tab_index, &error_msg)) {
     *error = new Error(kUnknownError, error_msg);
@@ skipping 189 matching lines @@
       768, 0, "Alerts are not supported for this version of Chrome");
 }
 
 Error* Automation::CheckAdvancedInteractionsSupported() {
   const char* message =
       "Advanced user interactions are not supported for this version of Chrome";
   return CheckVersion(750, 0, message);
 }
 
 }  // namespace webdriver