Move OpenProcessHandleWithAccess to Process::OpenWithAccess.

chrome/browser/chrome_process_finder_win.cc

 // Copyright 2013 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/browser/chrome_process_finder_win.h"
 
 #include <shellapi.h>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
-#include "base/process/process_handle.h"
+#include "base/process/process.h"
 #include "base/process/process_info.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/message_window.h"
 #include "base/win/metro.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/metro_utils/metro_chrome_win.h"
@@ skipping 80 matching lines @@
 NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window,
                                                 bool fast_start) {
   DCHECK(remote_window);
   static const char kSearchUrl[] =
       "http://www.google.com/search?q=%s&sourceid=chrome&ie=UTF-8";
   DWORD process_id = 0;
   DWORD thread_id = GetWindowThreadProcessId(remote_window, &process_id);
   if (!thread_id || !process_id)
     return NOTIFY_FAILED;
 
-#if !defined(USE_AURA)
-  if (base::win::IsMetroProcess()) {
-    // Interesting corner case. We are launched as a metro process but we
-    // found another chrome running. Since metro enforces single instance then
-    // the other chrome must be desktop chrome and this must be a search charm
-    // activation. This scenario is unique; other cases should be properly
-    // handled by the delegate_execute which will not activate a second chrome.
-    base::string16 terms;
-    base::win::MetroLaunchType launch = base::win::GetMetroLaunchParams(&terms);
-    if (launch != base::win::METRO_SEARCH) {
-      LOG(WARNING) << "In metro mode, but and launch is " << launch;
-    } else {
-      std::string query = EscapeQueryParamValue(base::UTF16ToUTF8(terms), true);
-      std::string url = base::StringPrintf(kSearchUrl, query.c_str());
-      SHELLEXECUTEINFOA sei = { sizeof(sei) };
-      sei.fMask = SEE_MASK_FLAG_LOG_USAGE;
-      sei.nShow = SW_SHOWNORMAL;
-      sei.lpFile = url.c_str();
-      OutputDebugStringA(sei.lpFile);
-      sei.lpDirectory = "";
-      ::ShellExecuteExA(&sei);
-    }
-    return NOTIFY_SUCCESS;
-  }
-
-  base::win::ScopedHandle process_handle;
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
-      base::OpenProcessHandleWithAccess(
-          process_id, PROCESS_QUERY_INFORMATION,
-          process_handle.Receive())) {
-    // Receive() causes the process handle to be set in the destructor of the
-    // temporary receiver object, which does not happen until after the if
-    // statement is complete.  So IsProcessImmersive() should only be checked
-    // as part of a separate if statement.
-    if (base::win::IsProcessImmersive(process_handle.Get()))
-      chrome::ActivateMetroChrome();
-  }
-#endif

[Nico, 2015/07/26 02:54:08]

Did you delete this block intentionally? It looks unrelated to the CL
description to me.

-
   base::CommandLine command_line(*base::CommandLine::ForCurrentProcess());
   command_line.AppendSwitchASCII(
       switches::kOriginalProcessStartTime,
       base::Int64ToString(
           base::CurrentProcessInfo::CreationTime().ToInternalValue()));
 
   if (fast_start)
     command_line.AppendSwitch(switches::kFastStart);
 
   // Send the command line to the remote chrome window.
@@ skipping 28 matching lines @@
 
   // It is possible that the process owning this window may have died by now.
   if (!::IsWindow(remote_window))
     return NOTIFY_FAILED;
 
   // If the window couldn't be notified but still exists, assume it is hung.
   return NOTIFY_WINDOW_HUNG;
 }
 
 }  // namespace chrome