Revert of ChromeOS: should not show "Language changed" notification for certain languages.

chrome/browser/chromeos/locale_change_guard.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_BROWSER_CHROMEOS_LOCALE_CHANGE_GUARD_H_
 #define CHROME_BROWSER_CHROMEOS_LOCALE_CHANGE_GUARD_H_
 
 #include <string>
 
 #include "ash/system/locale/locale_observer.h"
 #include "base/compiler_specific.h"
-#include "base/gtest_prod_util.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_types.h"
 
 class Profile;
 
@@ skipping 18 matching lines @@
   virtual void RevertLocaleChange() OVERRIDE;
 
   // Called just before changing locale.
   void PrepareChangingLocale(
       const std::string& from_locale, const std::string& to_locale);
 
   // Called after login.
   void OnLogin();
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(LocaleChangeGuardTest,
-                           ShowNotificationLocaleChanged);
-  FRIEND_TEST_ALL_PREFIXES(LocaleChangeGuardTest,
-                           ShowNotificationLocaleChangedList);
-
   void RevertLocaleChangeCallback(const base::ListValue* list);
   void Check();
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // Returns true if we should notify user about automatic locale change.
-  static bool ShouldShowLocaleChangeNotification(const std::string& from_locale,
-                                                 const std::string& to_locale);
-
-  static const char* const* GetSkipShowNotificationLanguagesForTesting();
-  static size_t GetSkipShowNotificationLanguagesSizeForTesting();
-
   std::string from_locale_;
   std::string to_locale_;
   Profile* profile_;
   bool reverted_;
   bool session_started_;
   bool main_frame_loaded_;
   content::NotificationRegistrar registrar_;
 
   // We want to show locale change notification in previous language however
   // we cannot directly load strings for non-current locale.  So we cache
   // messages before locale change.
   base::string16 title_text_;
   base::string16 message_text_;
   base::string16 revert_link_text_;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOCALE_CHANGE_GUARD_H_