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 71 matching lines @@
     : launch_arguments_(CommandLine::NO_PROGRAM),
       expected_errors_(0),
       expected_crashes_(0),
       homepage_(chrome::kAboutBlankURL),
       wait_for_initial_loads_(true),
       dom_automation_enabled_(false),
       show_window_(false),
       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_);
 }
 
 UITestBase::UITestBase(MessageLoop::Type msg_loop_type)
     : launch_arguments_(CommandLine::NO_PROGRAM),
       expected_errors_(0),
       expected_crashes_(0),
       wait_for_initial_loads_(true),
       dom_automation_enabled_(false),
       show_window_(false),
       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_);
 }
 
 UITestBase::~UITestBase() {}
 
 void UITestBase::SetUp() {
   // Tests that do a session restore (e.g. SessionRestoreUITest, StartupTest)
   // call SetUp() multiple times because they restart the browser mid-test.
@@ skipping 50 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;
+  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 =
       { clear_profile_, template_user_data_, profile_type_,
         command, include_testing_id_, show_window_ };
   return state;
 }
 
 bool UITestBase::ShouldFilterInet() {
   return true;
@@ skipping 570 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;
 }