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

chrome_frame/test_utils.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 <algorithm>
 
 #include "chrome_frame/test_utils.h"
 
 #include <atlbase.h>
 #include <atlwin.h>
@@ skipping 11 matching lines @@
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 const wchar_t kChromeFrameDllName[] = L"npchrome_frame.dll";
 const wchar_t kChromeLauncherExeName[] = L"chrome_launcher.exe";
 
 FilePath GetChromeFrameBuildPath() {
   FilePath build_path;
   PathService::Get(chrome::DIR_APP, &build_path);
 
-  FilePath dll_path = build_path.Append(L"servers").
-                                 Append(kChromeFrameDllName);
+  FilePath dll_path = build_path.Append(kChromeFrameDllName);
 
   if (!file_util::PathExists(dll_path)) {
     // Well, dang.. try looking in the current directory.
     dll_path = build_path.Append(kChromeFrameDllName);
   }
 
   if (!file_util::PathExists(dll_path)) {
     // No luck, return something empty.
     dll_path = FilePath();
   }
 
   return dll_path;
 }
 
-bool ScopedChromeFrameRegistrar::register_chrome_path_provider_ = false;;
+bool ScopedChromeFrameRegistrar::register_chrome_path_provider_ = false;
 
 // static
 void ScopedChromeFrameRegistrar::RegisterDefaults() {
   if (!register_chrome_path_provider_) {
     chrome::RegisterPathProvider();
     register_chrome_path_provider_ = true;
   }
   FilePath dll_path = GetChromeFrameBuildPath();
   RegisterAtPath(dll_path.value(), chrome_frame_test::GetTestBedType());
 }
@@ skipping 283 matching lines @@
       UOI_NAME,
       name,
       sizeof(name),
       &needed)) {
         is_locked = lstrcmpi(name, L"default") != 0;
     }
     ::CloseDesktop(input_desk);
   }
   return is_locked;
 }