Support Chromium-branded builds and cleanup reference build usage.

chrome/test/ui/ui_test.cc

Index: chrome/test/ui/ui_test.cc
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 283084871e33085de1266844aea76afa7cb3adbf..ce206f28fb9263e79394a8fd0390affa408e31bf 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -89,6 +89,7 @@ UITestBase::UITestBase()
       clear_profile_(true),
       include_testing_id_(true),
       enable_file_cookies_(true),
+      enable_chrome_branding_(true),
       profile_type_(ProxyLauncher::DEFAULT_THEME) {
   PathService::Get(chrome::DIR_APP, &browser_directory_);
   PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_);
@@ -104,6 +105,7 @@ UITestBase::UITestBase(MessageLoop::Type msg_loop_type)
       clear_profile_(true),
       include_testing_id_(true),
       enable_file_cookies_(true),
+      enable_chrome_branding_(true),
       profile_type_(ProxyLauncher::DEFAULT_THEME) {
   PathService::Get(chrome::DIR_APP, &browser_directory_);
   PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_);
@@ -174,8 +176,13 @@ ProxyLauncher* UITestBase::CreateProxyLauncher() {
 }
 
 ProxyLauncher::LaunchState UITestBase::DefaultLaunchState() {
-  FilePath browser_executable = browser_directory_.Append(
-      chrome::kBrowserProcessExecutablePath);
+  FilePath browser_executable;
+  if (enable_chrome_branding_)
+    browser_executable = browser_directory_.Append(
+        chrome::kBrowserProcessExecutablePath);
+  else
+    browser_executable = browser_directory_.Append(
+        chrome::kBrowserProcessExecutablePathChromium);

[cmp, 2011/06/16 23:29:40]

I believe there's also a use of kBrowserProcessExecutableName that needs to be
replaced in the enable_chrome_branding_ false case with a use of
kBrowserProcessExecutableNameChromium.  Building and running startup_tests with
official branding on Mac should show you where that is, if it's really there at
all.

   CommandLine command(browser_executable);
   command.AppendArguments(launch_arguments_, false);
   ProxyLauncher::LaunchState state =