Abstract notification clicks in its own dictionary

chrome/browser/ui/cocoa/notifications/notification_builder_mac_unittest.mm

 // Copyright 2016 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.
 
 #import <AppKit/AppKit.h>
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/cocoa/notifications/notification_builder_mac.h"
+#include "chrome/browser/ui/cocoa/notifications/notification_constants_mac.h"

[Peter Beverloo, 2016/06/16 17:02:43]

You use #include for this file here, #import elsewhere. In my understanding, the
only difference is that "#import" ensures that a file is only being included
once. Maybe make that consistent?

[Miguel Garcia, 2016/06/17 17:53:08]

Should be include everywhere since it's a c++ file.

 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(NotificationBuilderMacTest, TestNotificationNoButtons) {
   base::scoped_nsobject<NotificationBuilder> builder(
       [[NotificationBuilder alloc] init]);
   [builder setTitle:@"Title"];
   [builder setSubTitle:@"https://www.miguel.com"];
   [builder setContextMessage:@""];
   [builder setTag:@"tag1"];
   [builder setIcon:[NSImage imageNamed:@"NSApplicationIcon"]];
@@ skipping 87 matching lines @@
   [builder setNotificationId:@"Notification1"];
   [builder setIncognito:true];
 
   NSUserNotification* notification = [builder buildUserNotification];
   EXPECT_EQ("Title", base::SysNSStringToUTF8([notification title]));
 
   NSDictionary* userInfo = [notification userInfo];
 
   EXPECT_EQ("https://www.miguel.com",
             base::SysNSStringToUTF8([userInfo
-                objectForKey:notification_builder::kNotificationOrigin]));
+                objectForKey:notification_constants::kNotificationOrigin]));
   EXPECT_EQ("Notification1",
-            base::SysNSStringToUTF8(
-                [userInfo objectForKey:notification_builder::kNotificationId]));
+            base::SysNSStringToUTF8([userInfo
+                objectForKey:notification_constants::kNotificationId]));
   EXPECT_EQ("Profile1",
             base::SysNSStringToUTF8([userInfo
-                objectForKey:notification_builder::kNotificationProfileId]));
+                objectForKey:notification_constants::kNotificationProfileId]));
   EXPECT_TRUE([[userInfo
-      objectForKey:notification_builder::kNotificationIncognito] boolValue]);
+      objectForKey:notification_constants::kNotificationIncognito] boolValue]);
 }
 
 TEST(NotificationBuilderMacTest, TestBuildDictionary) {
   NSDictionary* notificationData;
   {
     base::scoped_nsobject<NotificationBuilder> sourceBuilder(
         [[NotificationBuilder alloc] init]);
     [sourceBuilder setTitle:@"Title"];
     [sourceBuilder setSubTitle:@"https://www.miguel.com"];
     [sourceBuilder setContextMessage:@"SubTitle"];
     [sourceBuilder setNotificationId:@"notificationId"];
     [sourceBuilder setProfileId:@"profileId"];
     [sourceBuilder setIncognito:false];
     notificationData = [sourceBuilder buildDictionary];
   }
   base::scoped_nsobject<NotificationBuilder> finalBuilder(
       [[NotificationBuilder alloc] initWithDictionary:notificationData]);
 
   NSUserNotification* notification = [finalBuilder buildUserNotification];
 
   EXPECT_EQ("Title", base::SysNSStringToUTF8([notification title]));
   EXPECT_EQ("SubTitle",
             base::SysNSStringToUTF8([notification informativeText]));
   EXPECT_EQ("https://www.miguel.com",
             base::SysNSStringToUTF8([notification subtitle]));
 }