[Android] Upstream remaining changes to NTP UI code.

chrome/common/chrome_notification_types.h

 // 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.
 
 #ifndef CHROME_COMMON_CHROME_NOTIFICATION_TYPES_H_
 #define CHROME_COMMON_CHROME_NOTIFICATION_TYPES_H_
 
 #include "build/build_config.h"
 #include "content/public/browser/notification_types.h"
 
@@ skipping 133 matching lines @@
   // expected.
   NOTIFICATION_EXTERNAL_TAB_CLOSED,
 
   // Indicates that the new page tab has finished loading. This is used for
   // performance testing to see how fast we can load it after startup, and is
   // only called once for the lifetime of the browser. The source is unused.
   // Details is an integer: the number of milliseconds elapsed between
   // starting and finishing all painting.
   NOTIFICATION_INITIAL_NEW_TAB_UI_LOAD,
 
+#if defined(OS_ANDROID)

[sky, 2012/10/09 00:35:25]

Why is this android specific?

[newt (away), 2012/10/09 09:49:27]

We added the event to reduce flakiness for tests that start by loading the NTP. 
It's fired and listened for only on Android (We have separate html/js for the
Android NTP), so I saw no reason to compile it on other platforms.

[sky, 2012/10/09 15:59:13]

Ok. From the description it seemed like it might be fired in cross platform
code, but if that's not the case the ifdef is fine.

+  // Indicates that the new tab page is ready.  This is different than
+  // NOTIFICATION_INITIAL_NEW_TAB_UI_LOAD as the NTP might do some more in-page
+  // navigations after it's done loading, potentially causing flakyness in tests
+  // that would navigate as soon as the NTP is done loading.
+  // When this notification happen, it guarantees the page is not going to do
+  // any further navigation.
+  // The source is the TabContents containing the NTP.
+  NOTIFICATION_NEW_TAB_READY,
+#endif
+
   // Used to fire notifications about how long various events took to
   // complete.  E.g., this is used to get more fine grained timings from the
   // new tab page.  The source is a WebContents and the details is a
   // MetricEventDurationDetails.
   NOTIFICATION_METRIC_EVENT_DURATION,
 
   // This notification is sent when extensions::TabHelper::SetExtensionApp is
   // invoked. The source is the extensions::TabHelper SetExtensionApp was
   // invoked on.
   NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED,
@@ skipping 1107 matching lines @@
   // Currently only Content and Chrome define and use notifications.
   // Custom notifications not belonging to Content and Chrome should start
   // from here.
   NOTIFICATION_CHROME_END,
 };
 
 }  // namespace chrome
 
 
 #endif  // CHROME_COMMON_CHROME_NOTIFICATION_TYPES_H_