Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/timezone_options_util.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/ui/webui/options2/chromeos/timezone_options_util.h"
 
 #include <string>
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
@@ skipping 103 matching lines @@
   timezone.getDisplayName(dst_offset != 0, icu::TimeZone::LONG, name);
   string16 result(l10n_util::GetStringFUTF16(
       IDS_OPTIONS_SETTINGS_TIMEZONE_DISPLAY_TEMPLATE, ASCIIToUTF16(offset_str),
       string16(name.getBuffer(), name.length()), GetExemplarCity(timezone)));
   base::i18n::AdjustStringForLocaleDirection(&result);
   return result;
 }
 
 }  // namespace
 
-namespace options2 {
+namespace options {
 
 // Creates a list of pairs of each timezone's ID and name.
 scoped_ptr<base::ListValue> GetTimezoneList() {
   const std::vector<icu::TimeZone*> &timezones =
       chromeos::system::TimezoneSettings::GetInstance()->GetTimezoneList();
   scoped_ptr<base::ListValue> timezoneList(new base::ListValue());
   for (std::vector<icu::TimeZone*>::const_iterator iter = timezones.begin();
        iter != timezones.end(); ++iter) {
     const icu::TimeZone* timezone = *iter;
     base::ListValue* option = new base::ListValue();
     option->Append(Value::CreateStringValue(
         chromeos::system::TimezoneSettings::GetTimezoneID(*timezone)));
     option->Append(Value::CreateStringValue(GetTimezoneName(*timezone)));
     timezoneList->Append(option);
   }
   return timezoneList.Pass();
 }
 
-}  // namespace options2
+}  // namespace options