Some Chrome Frame cleanup:...

chrome_frame/test/perf/chrome_frame_perftest.cc

 // Copyright (c) 2006-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/test/perf/chrome_frame_perftest.h"
 
 #include <atlwin.h>
 #include <atlhost.h>
 #include <map>
 #include <vector>
 #include <string>
@@ skipping 115 matching lines @@
     if (disp_id != DISPID_READYSTATE)
       return S_OK;
 
     long ready_state;
     HRESULT hr = tab_->get_readyState(&ready_state);
     DCHECK(hr == S_OK);
 
     OnReadyStateChanged(ready_state);
 
     if (ready_state == READYSTATE_COMPLETE) {
-      if(!starting_url_.empty()) {
+      if (!starting_url_.empty()) {
         Navigate(starting_url_.c_str());
       } else {
         PostMessage(WM_CLOSE);
       }
     } else if (ready_state == READYSTATE_UNINITIALIZED) {
       DLOG(ERROR) << __FUNCTION__ << " Chrome launch failed.";
     }
 
     return S_OK;
   }
@@ skipping 132 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(FILE_PATH_LITERAL("chrome.dll"));
     chrome_exe_ = dir_app_.Append(
         FilePath::FromWStringHack(chrome::kBrowserProcessExecutableName));
+    chrome_frame_dll_ = dir_app_.Append(FILE_PATH_LITERAL("servers"));
     chrome_frame_dll_ = dir_app_.Append(
-        FILE_PATH_LITERAL("servers\\npchrome_tab.dll"));
+        FilePath::FromWStringHack(kChromeFrameDllName));
   }
   virtual void TearDown() {}
 
   // 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,
                       const char* startup_url, bool test_cold,
                       int total_binaries, const FilePath binaries_to_evict[],
                       bool important, bool ignore_cache_error) {
@@ skipping 19 matching lines @@
         }
       }
 
       TimeTicks start_time, end_time;
 
       RunStartupTestImpl(&start_time, &end_time);
 
       timings[i] = end_time - start_time;
 
       CoFreeUnusedLibraries();
-      ASSERT_TRUE(GetModuleHandle(L"npchrome_tab.dll") == NULL);
+      ASSERT_TRUE(GetModuleHandle(kChromeFrameDllName) == NULL);
 
       // TODO(beng): Can't shut down so quickly. Figure out why, and fix. If we
       // do, we crash.
       PlatformThread::Sleep(50);
     }
 
     std::string times;
     for (int i = 0; i < kNumCycles; ++i)
       StringAppendF(&times, "%.2f,", timings[i].InMillisecondsF());
 
@@ skipping 473 matching lines @@
     chrome_frame_container_->CreateChromeFrameWindow(url.c_str());
     chrome_frame_container_->CreateControl(true);
 
     module.RunMessageLoop();
 
     chrome_frame_container_->Release();
 
     PrintResults(test_name_.c_str());
 
     CoFreeUnusedLibraries();
-    //ASSERT_TRUE(GetModuleHandle(L"npchrome_tab.dll") == NULL);
   }
 
   void NavigateImpl(const std::string& url) {
     ASSERT_TRUE(chrome_frame_container_ != NULL);
     ASSERT_TRUE(!url.empty());
     chrome_frame_container_->Navigate(url.c_str());
   }
 
   void TestCompleted() {
     // This can get called multiple times if the last url results in a
@@ skipping 268 matching lines @@
   ASSERT_TRUE(silverlight_key.ReadValue(L"", &plugin_path));
   ASSERT_FALSE(plugin_path.empty());
 
   FilePath silverlight_path = FilePath::FromWStringHack(plugin_path);
   FilePath binaries_to_evict[] = {silverlight_path};
 
   RunStartupTest("creation_cold", "t_silverlight", "", true /* cold */,
                  arraysize(binaries_to_evict), binaries_to_evict,
                  false /* important */, true);
 }