Elide origins displayed on web notifications.

chrome/browser/extensions/api/notifications/notifications_api.cc

 // 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.
 
 #include "chrome/browser/extensions/api/notifications/notifications_api.h"
 
 #include "base/callback.h"
 #include "base/guid.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 287 matching lines @@
       if (icon_bitmap_ptr) {
         NotificationConversionHelper::NotificationBitmapToGfxImage(
             image_scale, bitmap_sizes.button_icon_size, *icon_bitmap_ptr,
             &info.icon);
       }
       optional_fields.buttons.push_back(info);
     }
   }
 
   if (options->context_message) {
-    optional_fields.context_message =
-        base::UTF8ToUTF16(*options->context_message);
+    optional_fields.context_message.message = *options->context_message;
+    optional_fields.context_message.is_origin = false;
   }
 
   bool has_image = options->image_bitmap.get() &&
                    NotificationConversionHelper::NotificationBitmapToGfxImage(
                        image_scale, bitmap_sizes.image_size,
                        *options->image_bitmap, &optional_fields.image);
 
   // We should have an image if and only if the type is an image type.
   if (has_image != (type == message_center::NOTIFICATION_TYPE_IMAGE)) {
     SetError(kExtraImageProvided);
@@ skipping 115 matching lines @@
         NotificationConversionHelper::NotificationBitmapToGfxImage(
             image_scale, bitmap_sizes.button_icon_size, *icon_bitmap_ptr,
             &button.icon);
       }
       buttons.push_back(button);
     }
     notification->set_buttons(buttons);
   }
 
   if (options->context_message) {
-    notification->set_context_message(
-        base::UTF8ToUTF16(*options->context_message));
+    notification->set_context_message(*options->context_message,
+                                      false /* is_origin */);
   }
 
   gfx::Image image;
   bool has_image =
       options->image_bitmap.get() &&
       NotificationConversionHelper::NotificationBitmapToGfxImage(
           image_scale, bitmap_sizes.image_size, *options->image_bitmap, &image);
 
   if (has_image) {
     // We should have an image if and only if the type is an image type.
@@ skipping 229 matching lines @@
           ? api::notifications::PERMISSION_LEVEL_GRANTED
           : api::notifications::PERMISSION_LEVEL_DENIED;
 
   SetResult(new base::StringValue(api::notifications::ToString(result)));
   SendResponse(true);
 
   return true;
 }
 
 }  // namespace extensions