Remove the \servers build output directory and place Chrome Frame parts into the root output fold...

chrome_frame/test/perf/chrome_frame_perftest.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_frame/test/perf/chrome_frame_perftest.h"
 
 #include <atlwin.h>
 #include <atlhost.h>
 #include <map>
 #include <vector>
 #include <string>
@@ skipping 274 matching lines @@
 
 class ChromeFrameStartupTest : public ChromeFramePerfTestBase {
  public:
   ChromeFrameStartupTest() {}
 
   virtual void SetUp() {
     ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir_app_));
 
     chrome_dll_ = dir_app_.Append(L"chrome.dll");
     chrome_exe_ = dir_app_.Append(chrome::kBrowserProcessExecutableName);
-    chrome_frame_dll_ = dir_app_.Append(L"servers");
-    chrome_frame_dll_ = chrome_frame_dll_.Append(kChromeFrameDllName);
+    chrome_frame_dll_ = dir_app_.Append(kChromeFrameDllName);
     icu_dll_ = dir_app_.Append(L"icudt.dll");
     avcodec_dll_ = dir_app_.Append(L"avcodec-53.dll");
     avformat_dll_ = dir_app_.Append(L"avformat-53.dll");
     avutil_dll_ = dir_app_.Append(L"avutil-51.dll");
   }
 
   // TODO(iyengar)
   // This function is similar to the RunStartupTest function used in chrome
   // startup tests. Refactor into a common implementation.
   void RunStartupTest(const char* graph, const char* trace,
@@ skipping 1166 matching lines @@
   PrintPerfTestResults(automation_provider_connect_monitor, kNumCycles,
                        "automationproviderconnect");
   PrintPerfTestResults(external_tab_navigate_monitor, kNumCycles,
                        "externaltabnavigate");
   PrintPerfTestResults(renderer_main_monitor, kNumCycles,
                        "beginrenderermain");
 #ifdef NDEBUG
   PrintPerfTestResults(pre_read_chrome_monitor, kNumCycles, "PreReadImage");
 #endif  // NDEBUG
 }