Continue to remove CHROME_FRAME_BUILD define from code that goes into chrome....

chrome_frame/chrome_frame_automation.cc

 // Copyright (c) 2009 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_frame/chrome_frame_automation.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
@@ skipping 147 matching lines @@
 };
 
 ProxyFactory::ProxyFactory()
     : uma_send_interval_(0) {
   uma_send_interval_ = GetConfigInt(kDefaultSendUMADataInterval,
                                     kUmaSendIntervalValue);
 }
 
 ProxyFactory::~ProxyFactory() {
   for (size_t i = 0; i < proxies_.container().size(); ++i) {
-    if (WAIT_OBJECT_0 !=
-        WaitForSingleObject(proxies_[i]->thread->thread_handle(), 0))
+    DWORD result = WaitForSingleObject(proxies_[i]->thread->thread_handle(), 0);
+    if (WAIT_OBJECT_0 != result)
       // TODO(stoyan): Don't leak proxies on exit.
       DLOG(ERROR) << "Proxies leaked on exit.";
   }
 }
 
 void* ProxyFactory::GetAutomationServer(int launch_timeout,
     const std::wstring& profile_name,
     const std::wstring& extra_argument,
     bool perform_version_check,
     LaunchDelegate* delegate) {
@@ skipping 58 matching lines @@
       chrome_launcher::CreateLaunchCommandLine());
   command_line->AppendSwitchWithValue(switches::kAutomationClientChannelID,
       ASCIIToWide(proxy->channel_id()));
 
   // The metrics bug out because they attempt to use URLFetcher with a
   // null URLRequestContext::default_request_context_. Turn them off for now.
   // TODO(robertshield): Figure out why this is. It appears to have something
   // to do with an improperly set up profile...
   command_line->AppendSwitch(switches::kDisableMetrics);
 
+  // Run Chrome in Chrome Frame mode. In practice, this modifies the paths
+  // and registry keys that Chrome looks in via the BrowserDistribution
+  // mechanism.
+  command_line->AppendSwitch(switches::kChromeFrame);
+
   // Chrome Frame never wants Chrome to start up with a First Run UI.
   command_line->AppendSwitch(switches::kNoFirstRun);
 
   // Disable the "Whoa! Chrome has crashed." dialog, because that isn't very
   // useful for Chrome Frame users.
   command_line->AppendSwitch(switches::kNoErrorDialogs);
 
   command_line->AppendSwitch(switches::kEnableRendererAccessibility);
 
   // Place the profile directory in
@@ skipping 843 matching lines @@
   if (font_size < SMALLEST_FONT ||
       font_size > LARGEST_FONT) {
       NOTREACHED() << "Invalid font size specified : "
                    << font_size;
       return;
   }
 
   Send(new AutomationMsg_SetPageFontSize(0, tab_handle_, font_size));
 }