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..c7f806aae408609296f4fbc3c05099fe98e6f1fb 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -174,8 +174,7 @@ ProxyLauncher* UITestBase::CreateProxyLauncher() {
 }
 
 ProxyLauncher::LaunchState UITestBase::DefaultLaunchState() {
-  FilePath browser_executable = browser_directory_.Append(
-      chrome::kBrowserProcessExecutablePath);
+  FilePath browser_executable = browser_directory_.Append(GetExecutablePath());
   CommandLine command(browser_executable);
   command.AppendArguments(launch_arguments_, false);
   ProxyLauncher::LaunchState state =
@@ -406,6 +405,12 @@ FilePath UITestBase::GetDownloadDirectory() {
   return download_directory;
 }
 
+const FilePath::CharType* UITestBase::GetExecutablePath() {
+  if (launch_arguments_.HasSwitch(switches::kEnableChromiumBranding))
+    return chrome::kBrowserProcessExecutablePathChromium;
+  return chrome::kBrowserProcessExecutablePath;
+}
+
 void UITestBase::CloseBrowserAsync(BrowserProxy* browser) const {
   ASSERT_TRUE(automation()->Send(
       new AutomationMsg_CloseBrowserRequestAsync(browser->handle())));