Reverting r148671, r149866 (broke VS2008 builder) and r150361 (broke ninja).

Rolling GYP to r1458 to undo (r1457, r1452, r1450, r1449).

BUG=141132, 137755
TBR=alexeypa@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10828203

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150494 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 16 insertions, 76 deletions

diff --git a/DEPS b/DEPS
index 4dbb5d7..a6b0d78 100644
--- a/DEPS
+++ b/DEPS
@@ -100,7 +100,7 @@ deps = {
     (Var("googlecode_url") % "grit-i18n") + "/trunk@67",
 
   "src/tools/gyp":
-    (Var("googlecode_url") % "gyp") + "/trunk@1452",
+    (Var("googlecode_url") % "gyp") + "/trunk@1446",
 
   "src/v8":
     (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),
diff --git a/remoting/host/plugin/daemon_controller_win.cc b/remoting/host/plugin/daemon_controller_win.cc
index 2985652..2d8082c 100644
--- a/remoting/host/plugin/daemon_controller_win.cc
+++ b/remoting/host/plugin/daemon_controller_win.cc
@@ -51,17 +51,8 @@ const wchar_t kDaemonControllerElevationMoniker[] =
 // Name of the Daemon Controller's worker thread.
 const char kDaemonControllerThreadName[] = "Daemon Controller thread";
 
-// The maximum duration of keeping a reference to a privileged instance of
-// the Daemon Controller. This effectively reduces number of UAC prompts a user
-// sees.
-const int kPrivilegedTimeoutSec = 5 * 60;
-
-// The maximum duration of keeping a reference to an unprivileged instance of
-// the Daemon Controller. This interval should not be too long. If upgrade
-// happens while there is a live reference to a Daemon Controller instance
-// the old binary still can be used. So dropping the references often makes sure
-// that the old binary will go away sooner.
-const int kUnprivilegedTimeoutSec = 60;
+// The maximum interval between showing UAC prompts.
+const int kUacTimeoutSec = 15 * 60;
 
 // A base::Thread implementation that initializes COM on the new thread.
 class ComThread : public base::Thread {
@@ -305,13 +296,6 @@ HRESULT DaemonControllerWin::ActivateController() {
 
     // Ignore the error. IID_IDaemonControl2 is optional.
     control_.QueryInterface(IID_IDaemonControl2, control2_.ReceiveVoid());
-
-    // Release |control_| upon expiration of the timeout.
-    release_timer_.reset(new base::OneShotTimer<DaemonControllerWin>());
-    release_timer_->Start(FROM_HERE,
-                          base::TimeDelta::FromSeconds(kUnprivilegedTimeoutSec),
-                          this,
-                          &DaemonControllerWin::ReleaseController);
   }
 
   return S_OK;
@@ -355,7 +339,7 @@ HRESULT DaemonControllerWin::ActivateElevatedController() {
     // Release |control_| upon expiration of the timeout.
     release_timer_.reset(new base::OneShotTimer<DaemonControllerWin>());
     release_timer_->Start(FROM_HERE,
-                          base::TimeDelta::FromSeconds(kPrivilegedTimeoutSec),
+                          base::TimeDelta::FromSeconds(kUacTimeoutSec),
                           this,
                           &DaemonControllerWin::ReleaseController);
   }
diff --git a/remoting/host/win/chromoting.wxs b/remoting/host/win/chromoting.wxs
index bf8170f..57f8789 100644
--- a/remoting/host/win/chromoting.wxs
+++ b/remoting/host/win/chromoting.wxs
@@ -26,6 +26,7 @@
   <?define ControllerAppid = "{4ff35d5e-d226-4550-9248-03e7779e67de}" ?>
   <?define ControllerBinary = "remoting_host_controller.exe" ?>
   <?define ControllerClass = "ElevatedController Class" ?>
+  <?define ControllerClsid = "{430a9403-8176-4733-afdc-0b325a8fda84}" ?>
   <?define ControllerProgid =
     "ChromotingElevatedController.ElevatedController" ?>
   <?define ControllerTypelib = "{9d9a5a2c-576e-4acd-9c75-aabff74b205d}" ?>
@@ -43,10 +44,6 @@
   -->
   <?define ControllerSd = "010004805C0000006C00000000000000140000000200480003000000000014000300000001010000000000050400000000001400030000000101000000000005120000000000180003000000010200000000000520000000200200000102000000000005200000002002000001020000000000052000000020020000" ?>
 
-  <?ifndef ControllerClsid ?>
-    <?error ControllerClsid must be defined ?>
-  <?endif?>
-
   <?ifndef FileSource ?>
     <?error FileSource must be defined ?>
   <?endif?>
@@ -93,14 +90,10 @@
       <Directory Id="ProgramFilesFolder">
         <?ifdef OfficialBuild ?>
           <Directory Id="program_files_google" Name="Google">
-            <Directory Id="chromoting" Name="Chrome Remote Desktop">
-              <Directory Id="binaries" Name="$(var.Version)"/>
-            </Directory>
+            <Directory Id="binaries" Name="Chrome Remote Desktop"/>
           </Directory>
         <?else?>
-          <Directory Id="chromoting" Name="Chromoting">
-            <Directory Id="binaries" Name="$(var.Version)"/>
-          </Directory>
+          <Directory Id="binaries" Name="Chromoting"/>
         <?endif?>
       </Directory>
       <Directory Id="CommonAppDataFolder">
@@ -224,12 +217,11 @@
 
             <RegistryKey Key="CurVer" Action="create">
               <RegistryValue Type="string"
-                             Value="$(var.ControllerProgid).$(var.Version)"/>
+                             Value="$(var.ControllerProgid).1"/>
             </RegistryKey>
           </RegistryKey>
 
-          <RegistryKey Key="$(var.ControllerProgid).$(var.Version)"
-                       Action="create">
+          <RegistryKey Key="$(var.ControllerProgid).1" Action="create">
             <RegistryValue Type="string"
                            Value="$(var.ControllerClass)"/>
 
@@ -259,7 +251,7 @@
 
               <RegistryKey Key="ProgID" Action="create">
                 <RegistryValue Type="string"
-                               Value="$(var.ControllerProgid).$(var.Version)"/>
+                               Value="$(var.ControllerProgid).1"/>
               </RegistryKey>
 
               <RegistryKey Key="TypeLib" Action="create">
diff --git a/remoting/host/win/elevated_controller.h b/remoting/host/win/elevated_controller.h
index 23bd3a5..dc33e1e 100644
--- a/remoting/host/win/elevated_controller.h
+++ b/remoting/host/win/elevated_controller.h
@@ -16,10 +16,9 @@
 
 namespace remoting {
 
-class ATL_NO_VTABLE __declspec(uuid(DAEMON_CONTROLLER_CLSID)) ElevatedController
+class ATL_NO_VTABLE ElevatedController
     : public ATL::CComObjectRootEx<ATL::CComSingleThreadModel>,
-      public ATL::CComCoClass<ElevatedController,
-                              &__uuidof(ElevatedController)>,
+      public ATL::CComCoClass<ElevatedController, &CLSID_ElevatedController>,
       public ATL::IDispatchImpl<IDaemonControl2, &IID_IDaemonControl2,
                                 &LIBID_ChromotingElevatedControllerLib, 1, 1> {
  public:
@@ -58,7 +57,7 @@ class ATL_NO_VTABLE __declspec(uuid(DAEMON_CONTROLLER_CLSID)) ElevatedController
   DECLARE_PROTECT_FINAL_CONSTRUCT()
 };
 
-OBJECT_ENTRY_AUTO(__uuidof(ElevatedController), ElevatedController)
+OBJECT_ENTRY_AUTO(CLSID_ElevatedController, ElevatedController)
 
 } // namespace remoting
 
diff --git a/remoting/host/win/elevated_controller.idl b/remoting/host/win/elevated_controller.idl
index 74519a3..590b8dd 100644
--- a/remoting/host/win/elevated_controller.idl
+++ b/remoting/host/win/elevated_controller.idl
@@ -73,7 +73,7 @@ library ChromotingElevatedControllerLib {
   importlib("stdole2.tlb");
 
   [
-    uuid(DAEMON_CONTROLLER_CLSID),
+    uuid(430a9403-8176-4733-afdc-0b325a8fda84),
     helpstring("ElevatedController Class")
   ]
   coclass ElevatedController {
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 48725f9..dfaf0d6 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -118,12 +118,6 @@
           'webapp/_locales/en/messages.json',
         ],
       }],
-      ['OS=="win"', {
-        # Use auto-generated CLSID for the daemon controller to make sure that
-        # the newly installed version of the controller will be used during
-        # upgrade even if there is an old instance running already.
-        'daemon_controller_clsid': '<!(python tools/uuidgen.py)',
-      }],
     ],
     'remoting_webapp_files': [
       'resources/chromoting16.png',
@@ -518,9 +512,6 @@
         {
           'target_name': 'remoting_elevated_controller',
           'type': 'static_library',
-          'defines' : [
-            'DAEMON_CONTROLLER_CLSID=<(daemon_controller_clsid)',
-          ],
           'sources': [
             'host/win/elevated_controller.idl',
             '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller.h',
@@ -549,7 +540,6 @@
             '_ATL_NO_AUTOMATIC_NAMESPACE',
             '_ATL_CSTRING_EXPLICIT_CONSTRUCTORS',
             'STRICT',
-            'DAEMON_CONTROLLER_CLSID="{<(daemon_controller_clsid)}"',
           ],
           'include_dirs': [
             '<(INTERMEDIATE_DIR)',
@@ -773,7 +763,6 @@
               'action': [
                 'python', 'tools/candle_and_light.py',
                 '--wix_path', '<(wix_path)',
-                '--controller_clsid', '{<(daemon_controller_clsid)}',
                 '--version', '<(version_full)',
                 '--product_dir', '<(PRODUCT_DIR).',
                 '--intermediate_dir', '<(INTERMEDIATE_DIR).',
diff --git a/remoting/tools/candle_and_light.py b/remoting/tools/candle_and_light.py
index 74a2572..056bffd 100755
--- a/remoting/tools/candle_and_light.py
+++ b/remoting/tools/candle_and_light.py
@@ -23,7 +23,6 @@ def main():
   parser = OptionParser()
   parser.add_option('--wix_path', dest='wix_path')
   parser.add_option('--version', dest='version')
-  parser.add_option('--controller_clsid', dest='controller_clsid')
   parser.add_option('--product_dir', dest='product_dir')
   parser.add_option('--intermediate_dir', dest='intermediate_dir')
   parser.add_option('--sas_dll_path', dest='sas_dll_path')
@@ -43,7 +42,6 @@ def main():
       '-ext "%(wix_path)s\\WixFirewallExtension.dll" '
       '-ext "%(wix_path)s\\WixUIExtension.dll" '
       '-ext "%(wix_path)s\\WixUtilExtension.dll" '
-      '"-dControllerClsid="%(controller_clsid)s"" '
       '-dVersion=%(version)s '
       '"-dFileSource=%(product_dir)s" '
       '-dIconPath=resources/chromoting.ico '
diff --git a/remoting/tools/uuidgen.py b/remoting/tools/uuidgen.py
deleted file mode 100755
index ed1e415..0000000
--- a/remoting/tools/uuidgen.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-# 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.
-
-"""
-uuidgen.py -- UUID generation utility.
-"""
-
-import sys
-import uuid
-
-def main():
-  print uuid.uuid4()
-  return 0
-
-if __name__ == '__main__':
-  sys.exit(main())
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 028e5c7..b58696f 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -824,9 +824,7 @@
         'SK_GAMMA_SRGB',
         #'SK_GAMMA_APPLY_TO_A8',
         'SK_BUILD_NO_IMAGE_ENCODE',
-        # TODO(alexeypa): fix quoting in the skia sources,
-        # see http://crbug.com/141132.
-        'GR_GL_CUSTOM_SETUP_HEADER=<GrGLConfig_chrome.h>',
+        'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
         'GR_STATIC_RECT_VB=1',
         'GR_AGGRESSIVE_SHADER_OPTS=1',
         'SK_DISABLE_FAST_AA_STROKE_RECT',
@@ -1113,9 +1111,7 @@
         'defines': [
           'SK_BUILD_NO_IMAGE_ENCODE',
           'SK_DEFERRED_CANVAS_USES_GPIPE=1',
-          # TODO(alexeypa): fix quoting in the skia sources,
-          # see http://crbug.com/141132.
-          'GR_GL_CUSTOM_SETUP_HEADER=<GrGLConfig_chrome.h>',
+          'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
           'GR_AGGRESSIVE_SHADER_OPTS=1',
         ],
         'conditions': [