Support Chromium-branded builds and cleanup reference build usage.

chrome/test/ui/ui_test.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/ui/ui_test.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #include <sys/types.h>
 #endif
@@ skipping 156 matching lines @@
 void UITestBase::set_action_timeout_ms(int timeout) {
   automation()->set_action_timeout_ms(timeout);
   VLOG(1) << "Automation action timeout set to " << timeout << " ms";
 }
 
 ProxyLauncher* UITestBase::CreateProxyLauncher() {
   return new AnonymousProxyLauncher(false);
 }
 
 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 =
       { clear_profile_, template_user_data_, profile_type_,
         command, include_testing_id_, show_window_ };
   return state;
 }
 
 bool UITestBase::ShouldFilterInet() {
   return true;
@@ skipping 210 matching lines @@
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   EXPECT_TRUE(tab_proxy.get());
   if (!tab_proxy.get())
     return FilePath();
 
   FilePath download_directory;
   EXPECT_TRUE(tab_proxy->GetDownloadDirectory(&download_directory));
   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())));
 }
 
 bool UITestBase::CloseBrowser(BrowserProxy* browser,
                               bool* application_closed) const {
   DCHECK(application_closed);
   if (!browser->is_valid() || !browser->handle())
     return false;
@@ skipping 340 matching lines @@
     base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms() / kCycles);
   }
 
   LOG(INFO) << "Elapsed time: " << (base::Time::Now() - start).InSecondsF()
             << " seconds"
             << " call failed " << fail_count << " times"
             << " state was incorrect " << incorrect_state_count << " times";
   ADD_FAILURE() << "Timeout reached in " << __FUNCTION__;
   return false;
 }