Clean up ChildProcessHost unique id generation.

chrome/browser/signin/signin_manager.cc

 // Copyright (c) 2012 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/signin/signin_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/signin/signin_manager_cookie_helper.h"
 #include "chrome/browser/signin/signin_manager_delegate.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profile_management_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/common/child_process_host.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request_context.h"
 #include "third_party/icu/source/i18n/unicode/regex.h"
 
 using namespace signin_internals_util;
 
 using content::BrowserThread;
+using content::ChildProcessHost;
 
 namespace {
 
 const char kGetInfoDisplayEmailKey[] = "displayEmail";
 const char kGetInfoEmailKey[] = "email";
 
-const int kInvalidProcessId = -1;
-
 const char kChromiumSyncService[] = "service=chromiumsync";
 
 }  // namespace
 
 // Under the covers, we use a dummy chrome-extension ID to serve the purposes
 // outlined in the .h file comment for this string.
 const char* SigninManager::kChromeSigninEffectiveSite =
     "chrome-extension://acfccoigjajmmgbhpfbjnpckhjjegnih";
 
 // static
@@ skipping 14 matching lines @@
   return net::UnescapeURLComponent(
       url.query(), net::UnescapeRule::URL_SPECIAL_CHARS)
           .find(kChromiumSyncService) != std::string::npos;
 }
 
 SigninManager::SigninManager(scoped_ptr<SigninManagerDelegate> delegate)
     : prohibit_signout_(false),
       had_two_factor_error_(false),
       type_(SIGNIN_TYPE_NONE),
       weak_pointer_factory_(this),
-      signin_process_id_(kInvalidProcessId),
+      signin_host_id_(ChildProcessHost::kInvalidUniqueID),
       delegate_(delegate.Pass()) {
 }
 
 void SigninManager::SetSigninProcess(int process_id) {
-  if (process_id == signin_process_id_)
+  if (process_id == signin_host_id_)
     return;
-  DLOG_IF(WARNING, signin_process_id_ != kInvalidProcessId) <<
-      "Replacing in-use signin process.";
-  signin_process_id_ = process_id;
+  DLOG_IF(WARNING,
+          signin_host_id_ != ChildProcessHost::kInvalidUniqueID)
+      << "Replacing in-use signin process.";
+  signin_host_id_ = process_id;
   const content::RenderProcessHost* process =
       content::RenderProcessHost::FromID(process_id);
   DCHECK(process);
   registrar_.Add(this,
                  content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                  content::Source<content::RenderProcessHost>(process));
 }
 
 void SigninManager::ClearSigninProcess() {
-  signin_process_id_ = kInvalidProcessId;
+  signin_host_id_ = ChildProcessHost::kInvalidUniqueID;
 }
 
 bool SigninManager::IsSigninProcess(int process_id) const {
-  return process_id == signin_process_id_;
+  return process_id == signin_host_id_;
 }
 
 bool SigninManager::HasSigninProcess() const {
-  return signin_process_id_ != kInvalidProcessId;
+  return signin_host_id_ != ChildProcessHost::kInvalidUniqueID;
 }
 
 SigninManager::~SigninManager() {
 }
 
 void SigninManager::InitTokenService() {
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
   if (token_service && !GetAuthenticatedUsername().empty())
     token_service->LoadCredentials();
@@ skipping 472 matching lines @@
   OnClientLoginFailure(error);
 }
 
 void SigninManager::Observe(int type,
                             const content::NotificationSource& source,
                             const content::NotificationDetails& details) {
   DCHECK_EQ(content::NOTIFICATION_RENDERER_PROCESS_TERMINATED, type);
 
   // It's possible we're listening to a "stale" renderer because it was
   // replaced with a new process by process-per-site. In either case,
-  // stop listening to it, but only reset signin_process_id_ tracking
+  // stop listening to it, but only reset signin_host_id_ tracking
   // if this was from the current signin process.
   registrar_.Remove(this,
                     content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                     source);
-  if (signin_process_id_ ==
+  if (signin_host_id_ ==
       content::Source<content::RenderProcessHost>(source)->GetID()) {
-    signin_process_id_ = kInvalidProcessId;
+    signin_host_id_ = ChildProcessHost::kInvalidUniqueID;
   }
 }
 
 void SigninManager::ProhibitSignout(bool prohibit_signout) {
   prohibit_signout_ = prohibit_signout;
 }
 
 bool SigninManager::IsSignoutProhibited() const {
   return prohibit_signout_;
 }