AU: coalesce interactive / user-initiated flags

The latter was introduced recently but turns out it just carries
a duplicate meaning to the former, so we're eliminating it. This also
makes the case of a simulated scheduled update check more accurate, as
all of the effects of a scheduled update are made.

BUG=None
TEST=Unit tests; interactive/scheduled update check behaves as expected.

Change-Id: I8971aefcfc15cb76733059860832507e88795883
Reviewed-on: https://gerrit.chromium.org/gerrit/41082
Commit-Queue: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
diff --git a/dbus_service.cc b/dbus_service.cc
index 2d0f31b..7d3d39d 100644
--- a/dbus_service.cc
+++ b/dbus_service.cc
@@ -67,7 +67,7 @@
                                               GError **error) {
   string update_app_version;
   string update_omaha_url;
-  bool is_user_initiated = true;
+  bool interactive = true;
 
   // Only non-official (e.g., dev and test) builds can override the current
   // version and update server URL over D-Bus. However, pointing to the
@@ -86,17 +86,17 @@
       // pretend that it's not user-initiated even though it is,
       // so as to test scattering logic, etc. which get kicked off
       // only in scheduled update checks.
-      is_user_initiated = false;
+      interactive = false;
     } else if (strcmp(omaha_url, kAUTestURLRequest) == 0) {
       update_omaha_url = kAUTestURL;
     }
   }
   LOG(INFO) << "Attempt update: app_version=\"" << update_app_version << "\" "
             << "omaha_url=\"" << update_omaha_url << "\" "
-            << "is_user_initiated=" << (is_user_initiated? "yes" : "no");
+            << "interactive=" << (interactive? "yes" : "no");
   self->update_attempter_->CheckForUpdate(update_app_version,
                                           update_omaha_url,
-                                          is_user_initiated);
+                                          interactive);
   return TRUE;
 }