Cleanup, part 1.

* Consistently use underscores between words in identifiers (IDC_NEWTAB -> IDC_NEW_TAB)
* Make some identifiers clearer or more up-to-date (IDC_DUPLICATE -> IDC_DUPLICATE_TAB, IDC_GOOFFTHERECORD -> IDC_NEW_INCOGNITO_WINDOW, IDC_NEWPROFILEWINDOW -> IDC_PROFILE_MENU)
* Try and make string identifiers (IDS_xxx) match their corresponding IDC_xxx commands.  Tony tells me this will not cause any need for retranslation.
* As much as possible (without modifying automated UI test XML files), use "Bookmark Bar", not "Bookmarks Bar" (this seemed to be prevailing usage in the code)
* Fix 80-column issues

This patch touches move files than any subsequent patches, but should be the most rubber-stampable.

Review URL: http://codereview.chromium.org/13633

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6535 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/chrome/test/startup/feature_startup_test.cc b/chrome/test/startup/feature_startup_test.cc
index 59fdfa1..28d16e8 100644
--- a/chrome/test/startup/feature_startup_test.cc
+++ b/chrome/test/startup/feature_startup_test.cc
@@ -69,7 +69,7 @@ class NewTabUIStartupTest : public UITest {
       ASSERT_EQ(1, old_tab_count);
 
       // Hit ctl-t and wait for the tab to load.
-      window->ApplyAccelerator(IDC_NEWTAB);
+      window->ApplyAccelerator(IDC_NEW_TAB);
       int new_tab_count = -1;
       ASSERT_TRUE(window->WaitForTabCountToChange(old_tab_count, &new_tab_count,
                                                   5000));
@@ -82,9 +82,9 @@ class NewTabUIStartupTest : public UITest {
         // Bring up a second tab, now that we've already shown one tab.
         old_tab_count = new_tab_count;
         new_tab_count = -1;
-        window->ApplyAccelerator(IDC_NEWTAB);
-        ASSERT_TRUE(window->WaitForTabCountToChange(old_tab_count, &new_tab_count,
-                                                    5000));
+        window->ApplyAccelerator(IDC_NEW_TAB);
+        ASSERT_TRUE(window->WaitForTabCountToChange(old_tab_count,
+                                                    &new_tab_count, 5000));
         ASSERT_EQ(3, new_tab_count);
         ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
         timings[i] = TimeDelta::FromMilliseconds(load_time);