Changed SyncStatusUIHelper namespace class into a real namespace (sync_ui_util), per style guide.

Changed static functions into anonymous-namespace functions.

Renamed files/namespaces from sync_status_ui_helper to sync_ui_util.

Moved sync_ui_util_mac.mm functions into sync_ui_util namespace.

Updated all callers.

BUG=none
TEST=trybots

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

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

3 files changed, 11 insertions, 11 deletions

diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc
index 67c1d16..c48042f 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bar_gtk.cc
@@ -33,7 +33,7 @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/ntp_background_util.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/sync/sync_status_ui_helper.h"
+#include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/gtk_util.h"
@@ -1321,10 +1321,10 @@ bool BookmarkBarGtk::ShouldShowSyncErrorButton() {
   if (sync_service_ && sync_service_->HasSyncSetupCompleted()) {
     string16 status_text;
     string16 link_text;
-    SyncStatusUIHelper::MessageType sync_status;
-    sync_status = SyncStatusUIHelper::GetLabels(
+    sync_ui_util::MessageType sync_status;
+    sync_status = sync_ui_util::GetStatusLabels(
         sync_service_, &status_text, &link_text);
-    if (sync_status == SyncStatusUIHelper::SYNC_ERROR) {
+    if (sync_status == sync_ui_util::SYNC_ERROR) {
       show_sync_error_button = true;
     }
   }
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc
index 9fc35fb..f59853d 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/gtk/browser_toolbar_gtk.cc
@@ -34,7 +34,7 @@
 #include "chrome/browser/gtk/view_id_util.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/sync/sync_status_ui_helper.h"
+#include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/notification_details.h"
@@ -703,12 +703,12 @@ void BrowserToolbarGtk::OnStateChanged() {
   string16 link;
   // TODO(zork): Need a ui helper method to just get the type without
   // needing labels.
-  SyncStatusUIHelper::MessageType type = SyncStatusUIHelper::GetLabels(
+  sync_ui_util::MessageType type = sync_ui_util::GetStatusLabels(
       sync_service_, &label, &link);
 
-  int menu_label = type == SyncStatusUIHelper::SYNCED ?
+  int menu_label = type == sync_ui_util::SYNCED ?
       IDS_SYNC_MENU_BOOKMARKS_SYNCED_LABEL :
-      type == SyncStatusUIHelper::SYNC_ERROR ?
+      type == sync_ui_util::SYNC_ERROR ?
       IDS_SYNC_MENU_BOOKMARK_SYNC_ERROR_LABEL :
       IDS_SYNC_START_SYNC_BUTTON_LABEL;
 
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc
index 0dfd8e1..b4d67ba 100644
--- a/chrome/browser/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/gtk/options/content_page_gtk.cc
@@ -17,7 +17,7 @@
 #include "chrome/browser/gtk/import_dialog_gtk.h"
 #include "chrome/browser/gtk/options/options_layout_gtk.h"
 #include "chrome/browser/gtk/options/passwords_exceptions_window_gtk.h"
-#include "chrome/browser/sync/sync_status_ui_helper.h"
+#include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
@@ -353,8 +353,8 @@ void ContentPageGtk::UpdateSyncControls() {
   string16 link_label;
   std::string button_label;
   bool sync_setup_completed = sync_service_->HasSyncSetupCompleted();
-  bool status_has_error = SyncStatusUIHelper::GetLabels(sync_service_,
-      &status_label, &link_label) == SyncStatusUIHelper::SYNC_ERROR;
+  bool status_has_error = sync_ui_util::GetStatusLabels(sync_service_,
+      &status_label, &link_label) == sync_ui_util::SYNC_ERROR;
   if (sync_setup_completed) {
     button_label = l10n_util::GetStringUTF8(IDS_SYNC_STOP_SYNCING_BUTTON_LABEL);
   } else if (sync_service_->SetupInProgress()) {