Revert r46023: "Detect new instance of the browser when running in the background in persistent"

chrome/app/client_util.cc

 // Copyright (c) 2006-2008 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 <windows.h>
 #include <shlwapi.h>
 
 #include "chrome/app/breakpad_win.h"
 #include "chrome/app/client_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/util_constants.h"
 
 namespace {
 // The entry point signature of chrome.dll.
 typedef int (*DLL_MAIN)(HINSTANCE, sandbox::SandboxInterfaceInfo*, wchar_t*);
 
-typedef void (*RelaunchChromeBrowserWithNewCommandLineIfNeededFunc)();
-
 // Not generic, we only handle strings up to 128 chars.
 bool ReadRegistryStr(HKEY key, const wchar_t* name, std::wstring* value) {
   BYTE out[128 * sizeof(wchar_t)];
   DWORD size = sizeof(out);
   DWORD type = 0;
   if (ERROR_SUCCESS != ::RegQueryValueExW(key, name, NULL, &type, out, &size))
     return false;
   if (type != REG_SZ)
     return false;
   value->assign(reinterpret_cast<wchar_t*>(out));
@@ skipping 158 matching lines @@
 
   DLL_MAIN entry_point =
       reinterpret_cast<DLL_MAIN>(::GetProcAddress(dll_, "ChromeMain"));
   if (!entry_point)
     return ResultCodes::BAD_PROCESS_TYPE;
 
   int rc = entry_point(instance, sbox_info, ::GetCommandLineW());
   return OnBeforeExit(rc);
 }
 
-void MainDllLoader::RelaunchChromeBrowserWithNewCommandLineIfNeeded() {
-  RelaunchChromeBrowserWithNewCommandLineIfNeededFunc relaunch_function =
-      reinterpret_cast<RelaunchChromeBrowserWithNewCommandLineIfNeededFunc>(
-          ::GetProcAddress(dll_,
-                           "RelaunchChromeBrowserWithNewCommandLineIfNeeded"));
-  if (!relaunch_function) {
-    LOG(ERROR) << "Could not find exported function "
-               << "RelaunchChromeBrowserWithNewCommandLineIfNeeded";
-  } else {
-    relaunch_function();
-  }
-}
-
 //=============================================================================
 
 class ChromeDllLoader : public MainDllLoader {
  public:
   virtual std::wstring GetRegistryPath() {
     std::wstring key(google_update::kRegPathClients);
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     key.append(L"\\").append(dist->GetAppGuid());
     return key;
   }
@@ skipping 25 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }