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

components/handoff/handoff_manager.mm

Index: components/handoff/handoff_manager.mm
diff --git a/components/handoff/handoff_manager.mm b/components/handoff/handoff_manager.mm
index ab1efd693a5f701accbef39d1f56266cfb14f8eb..f53fe88d1bfb081ca58114891d6b0adb52610a76 100644
--- a/components/handoff/handoff_manager.mm
+++ b/components/handoff/handoff_manager.mm
@@ -6,7 +6,6 @@
 
 #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)
@@ -36,9 +35,16 @@
 @synthesize userActivity = _userActivity;
 
 - (instancetype)init {
+  NOTREACHED();
+  return nil;
+}
+
+- (instancetype)initWithOrigin:(handoff::Origin)origin {
+  DCHECK(origin == handoff::ORIGIN_IOS || origin == handoff::ORIGIN_MAC);
   self = [super init];

[Avi (use Gerrit), 2015/03/26 18:14:04]

Can we #ifdef so that if this is built for iOS we automatically get ORIGIN_IOS
and if built for Mac we get ORIGIN_MAC?

[erikchen, 2015/03/26 18:22:36]

Good suggestion, done.

   if (self) {
     _propertyReleaser_HandoffManager.Init(self, [HandoffManager class]);
+    _origin = origin;
   }
   return self;
 }
@@ -84,7 +90,9 @@
            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];
 }