handoff: Fix the origin so that it correctly reflects the sender.

components/handoff/handoff_manager.mm

 // Copyright 2014 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 "components/handoff/handoff_manager.h"
 
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
-#include "components/handoff/handoff_utility.h"
 #include "net/base/mac/url_conversions.h"
 
 #if defined(OS_IOS)
 #include "base/ios/ios_util.h"
 #endif
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "base/mac/mac_util.h"
 #include "base/mac/sdk_forward_declarations.h"
 #endif
@@ skipping 12 matching lines @@
 @end
 
 @implementation HandoffManager
 
 @synthesize userActivity = _userActivity;
 
 - (instancetype)init {
   self = [super init];
   if (self) {
     _propertyReleaser_HandoffManager.Init(self, [HandoffManager class]);
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+    _origin = handoff::ORIGIN_MAC;
+#elif defined(OS_IOS)
+    _origin = handoff::ORIGIN_IOS;

[Avi (use Gerrit), 2015/03/26 18:40:21]

#if defined(OS_IOS)
    _origin = handoff::ORIGIN_IOS;
#elif defined(OS_MACOSX)
    _origin = handoff::ORIGIN_MAC;

?

[erikchen, 2015/03/27 14:52:24]

I'm generally a fan of shorter code, but in this case I prefer being more
verbose. It's unclear that OS_MACOSX can be defined while OS_IOS is also
defined. In your suggestion, it would be very easy for someone to reverse the
#if/#elif, and not realize that they violated an implicit dependency between the
conditionals. We could add comments, but that would yield more code than what I
have right now.

[Avi (use Gerrit), 2015/03/27 15:16:38]

That makes sense.

+#else
+    NOTREACHED();
+#endif
   }
   return self;
 }
 
 - (void)updateActiveURL:(const GURL&)url {
 #if defined(OS_IOS)
   // Handoff is only available on iOS 8+.
   DCHECK(base::ios::IsRunningOnIOS8OrLater());
 #endif
 
@@ skipping 25 matching lines @@
 
   // Invalidate the old user activity and make a new one.
   [self.userActivity invalidate];
 
   Class aClass = NSClassFromString(@"NSUserActivity");
   NSUserActivity* userActivity = [[aClass performSelector:@selector(alloc)]
       performSelector:@selector(initWithActivityType:)
            withObject:handoff::kChromeHandoffActivityType];
   self.userActivity = base::scoped_nsobject<NSUserActivity>(userActivity);
   self.userActivity.webpageURL = net::NSURLWithGURL(_activeURL);
-  self.userActivity.userInfo = @{ handoff::kOriginKey : handoff::kOriginiOS };
+  NSString* origin = handoff::StringFromOrigin(_origin);
+  DCHECK(origin);
+  self.userActivity.userInfo = @{ handoff::kOriginKey : origin };
   [self.userActivity becomeCurrent];
 }
 
 @end