Move chromeos code to namespace chromeos.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/341044

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

43 files changed, 324 insertions, 162 deletions

diff --git a/chrome/browser/chromeos/chromeos_browser_extenders.cc b/chrome/browser/chromeos/browser_extenders.cc
index 9e3645e..9e3645e 100644
--- a/chrome/browser/chromeos/chromeos_browser_extenders.cc
+++ b/chrome/browser/chromeos/browser_extenders.cc
diff --git a/chrome/browser/chromeos/clock_menu_button.cc b/chrome/browser/chromeos/clock_menu_button.cc
index d89d474..8076384 100644
--- a/chrome/browser/chromeos/clock_menu_button.cc
+++ b/chrome/browser/chromeos/clock_menu_button.cc
@@ -18,6 +18,8 @@
 #include "grit/generated_resources.h"
 #include "unicode/calendar.h"
 
+namespace chromeos {
+
 // Amount of slop to add into the timer to make sure we're into the next minute
 // when the timer goes off.
 const int kTimerSlopSeconds = 1;
@@ -140,3 +142,5 @@ void ClockMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
   clock_menu_.UpdateStates();
   clock_menu_.RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/clock_menu_button.h b/chrome/browser/chromeos/clock_menu_button.h
index e268cd2..4bcc1b6 100644
--- a/chrome/browser/chromeos/clock_menu_button.h
+++ b/chrome/browser/chromeos/clock_menu_button.h
@@ -14,6 +14,8 @@
 
 class Browser;
 
+namespace chromeos {
+
 // The clock menu button in the status area.
 // This button shows the current time.
 class ClockMenuButton : public views::MenuButton,
@@ -70,4 +72,6 @@ class ClockMenuButton : public views::MenuButton,
   DISALLOW_COPY_AND_ASSIGN(ClockMenuButton);
 };
 
+}  // namespace chromeos
+
 #endif  // CHROME_BROWSER_CHROMEOS_CLOCK_MENU_BUTTON_H_
diff --git a/chrome/browser/chromeos/compact_location_bar.cc b/chrome/browser/chromeos/compact_location_bar.cc
index 3405d1e..8cd3b82 100644
--- a/chrome/browser/chromeos/compact_location_bar.cc
+++ b/chrome/browser/chromeos/compact_location_bar.cc
@@ -27,6 +27,8 @@
 #include "views/controls/native/native_view_host.h"
 #include "views/widget/widget.h"
 
+namespace chromeos {
+
 const int kDefaultLocationBarWidth = 300;
 const int kHideTimeoutInSeconds = 2;
 
@@ -271,3 +273,4 @@ gfx::Rect CompactLocationBar::GetLocationStackBounds() const {
   return gfx::Rect(lower_left.x(), lower_left.y(), 700, 100);
 }
 
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/compact_location_bar.h b/chrome/browser/chromeos/compact_location_bar.h
index 6d70e75..599cb44 100644
--- a/chrome/browser/chromeos/compact_location_bar.h
+++ b/chrome/browser/chromeos/compact_location_bar.h
@@ -25,6 +25,8 @@ class ImageButton;
 class NativeViewHost;
 }  // namespace views
 
+namespace chromeos {
+
 // CompactLocationBar is a version of location bar that is shown under
 // a tab for short priod of used when Chrome is in the compact
 // navigation bar mode.
@@ -107,5 +109,7 @@ class CompactLocationBar : public views::View,
   DISALLOW_COPY_AND_ASSIGN(CompactLocationBar);
 };
 
+}  // namespace chromeos
+
 #endif  // CHROME_BROWSER_CHROMEOS_COMPACT_LOCATION_BAR_H_
 
diff --git a/chrome/browser/chromeos/compact_navigation_bar.cc b/chrome/browser/chromeos/compact_navigation_bar.cc
index b316095..457d808 100644
--- a/chrome/browser/chromeos/compact_navigation_bar.cc
+++ b/chrome/browser/chromeos/compact_navigation_bar.cc
@@ -19,6 +19,8 @@
 #include "views/controls/image_view.h"
 #include "views/controls/native/native_view_host.h"
 
+namespace chromeos {
+
 // Padding inside each button around the image.
 static const int kInnerPadding = 1;
 
@@ -241,3 +243,5 @@ void CompactNavigationBar::AddTabWithURL(const GURL& url,
     }
   }
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/compact_navigation_bar.h b/chrome/browser/chromeos/compact_navigation_bar.h
index dec7c1d..1e4d23d 100644
--- a/chrome/browser/chromeos/compact_navigation_bar.h
+++ b/chrome/browser/chromeos/compact_navigation_bar.h
@@ -21,6 +21,8 @@ class ImageView;
 class NativeViewHost;
 }
 
+namespace chromeos {
+
 // This class provides a small navigation bar that includes back, forward, and
 // a small text entry box.
 class CompactNavigationBar : public views::View,
@@ -75,4 +77,6 @@ class CompactNavigationBar : public views::View,
   DISALLOW_COPY_AND_ASSIGN(CompactNavigationBar);
 };
 
+}  // namespace chromeos
+
 #endif  // CHROME_BROWSER_CHROMEOS_COMPACT_NAVIGATION_BAR_H_
diff --git a/chrome/browser/chromeos/cros_library.cc b/chrome/browser/chromeos/cros_library.cc
index b248db3..40d5e4e 100644
--- a/chrome/browser/chromeos/cros_library.cc
+++ b/chrome/browser/chromeos/cros_library.cc
@@ -12,6 +12,8 @@
 #include "chrome/common/chrome_paths.h"
 #include "third_party/cros/chromeos_cros_api.h"
 
+namespace chromeos {
+
 // static
 bool CrosLibrary::loaded_ = false;
 
@@ -21,7 +23,7 @@ bool CrosLibrary::loaded() {
   if (!initialized) {
     FilePath path;
     if (PathService::Get(chrome::FILE_CHROMEOS_API, &path))
-      loaded_ = chromeos::LoadCros(path.value().c_str());
+      loaded_ = LoadCros(path.value().c_str());
 
     if (!loaded_) {
       char* error = dlerror();
@@ -32,3 +34,5 @@ bool CrosLibrary::loaded() {
   }
   return loaded_;
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/cros_library.h b/chrome/browser/chromeos/cros_library.h
index 56d2b91..2894f9a5 100644
--- a/chrome/browser/chromeos/cros_library.h
+++ b/chrome/browser/chromeos/cros_library.h
@@ -7,6 +7,8 @@
 
 #include "base/basictypes.h"
 
+namespace chromeos {
+
 // This class handles the loading of the ChromeOS shared library.
 class CrosLibrary {
  public:
@@ -24,4 +26,6 @@ class CrosLibrary {
   DISALLOW_COPY_AND_ASSIGN(CrosLibrary);
 };
 
+}  // namespace chromeos
+
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_LIBRARY_H_
diff --git a/chrome/browser/chromeos/external_cookie_handler.cc b/chrome/browser/chromeos/external_cookie_handler.cc
index 0b67233..34853a9 100644
--- a/chrome/browser/chromeos/external_cookie_handler.cc
+++ b/chrome/browser/chromeos/external_cookie_handler.cc
@@ -13,6 +13,8 @@
 #include "net/base/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 
+namespace chromeos {
+
 void ExternalCookieHandler::GetCookies(const CommandLine& parsed_command_line,
                                        Profile* profile) {
   // If there are Google External SSO cookies, add them to the cookie store.
@@ -70,3 +72,5 @@ bool ExternalCookieHandler::HandleCookies(net::CookieStore *cookie_store) {
   }
   return false;
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/external_cookie_handler.h b/chrome/browser/chromeos/external_cookie_handler.h
index 2886756..b50da8eb 100644
--- a/chrome/browser/chromeos/external_cookie_handler.h
+++ b/chrome/browser/chromeos/external_cookie_handler.h
@@ -20,6 +20,8 @@ namespace net {
 class CookieStore;
 }
 
+namespace chromeos {
+
 class ExternalCookieHandler {
  public:
   // Takes ownsership of |reader|.
@@ -46,4 +48,6 @@ class ExternalCookieHandler {
   DISALLOW_COPY_AND_ASSIGN(ExternalCookieHandler);
 };
 
+}  // namespace chromeos
+
 #endif  // CHROME_BROWSER_CHROMEOS_EXTERNAL_COOKIE_HANDLER_H_
diff --git a/chrome/browser/chromeos/external_cookie_handler_unittest.cc b/chrome/browser/chromeos/external_cookie_handler_unittest.cc
index 419ab87..00fbc8d 100644
--- a/chrome/browser/chromeos/external_cookie_handler_unittest.cc
+++ b/chrome/browser/chromeos/external_cookie_handler_unittest.cc
@@ -14,6 +14,8 @@
 #include "net/base/cookie_store.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace chromeos {
+
 typedef testing::Test ExternalCookieHandlerTest;
 
 static const std::string cookie1 = "coookie1\n";
@@ -151,3 +153,5 @@ TEST_F(ExternalCookieHandlerTest, SuccessfulSlowReadTest) {
   ExternalCookieHandler handler(reader);  // takes ownership.
   EXPECT_TRUE(handler.HandleCookies(cookie_store.get()));
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/gview_request_interceptor.cc b/chrome/browser/chromeos/gview_request_interceptor.cc
index 735424b..29f8b5b 100644
--- a/chrome/browser/chromeos/gview_request_interceptor.cc
+++ b/chrome/browser/chromeos/gview_request_interceptor.cc
@@ -11,6 +11,8 @@
 #include "net/url_request/url_request_redirect_job.h"
 #include "googleurl/src/gurl.h"
 
+namespace chromeos {
+
 // This is the list of mime types currently supported by the Google
 // Document Viewer.
 static const char* const supported_mime_type_list[] = {
@@ -61,3 +63,4 @@ URLRequest::Interceptor* GViewRequestInterceptor::GetGViewRequestInterceptor() {
   return Singleton<GViewRequestInterceptor>::get();
 }
 
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/gview_request_interceptor.h b/chrome/browser/chromeos/gview_request_interceptor.h
index ca6d2ae..dcb5f20 100644
--- a/chrome/browser/chromeos/gview_request_interceptor.h
+++ b/chrome/browser/chromeos/gview_request_interceptor.h
@@ -9,6 +9,8 @@
 #include "base/hash_tables.h"
 #include "net/url_request/url_request.h"
 
+namespace chromeos {
+
 // This class integrates the Google Document Viewer into ChromeOS,
 // enabling the viewing of supported document types that the user
 // clicks on.  This class will intercept requests to supported
@@ -37,5 +39,6 @@ class GViewRequestInterceptor : public URLRequest::Interceptor {
   base::hash_set<std::string> supported_mime_types_;
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_GVIEW_REQUEST_INTERCEPTOR_H__
+}  // namespace chromeos
 
+#endif  // CHROME_BROWSER_CHROMEOS_GVIEW_REQUEST_INTERCEPTOR_H__
diff --git a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
index 61978a7..12786d5 100644
--- a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
+++ b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
@@ -12,6 +12,8 @@
 #include "net/url_request/url_request_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace chromeos {
+
 class GViewURLRequestTestJob : public URLRequestTestJob {
  public:
   explicit GViewURLRequestTestJob(URLRequest* request)
@@ -97,3 +99,4 @@ TEST_F(GViewRequestInterceptorTest, InterceptPowerpoint) {
                  request.url());
 }
 
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/main_menu.cc b/chrome/browser/chromeos/main_menu.cc
index 72ee822..5a8e2e1 100644
--- a/chrome/browser/chromeos/main_menu.cc
+++ b/chrome/browser/chromeos/main_menu.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/chromeos/main_menu.h"
 
+#include <string>
 #include <vector>
 
 #include "app/gfx/insets.h"
@@ -30,6 +31,8 @@
 #include "views/widget/root_view.h"
 #include "views/widget/widget_gtk.h"
 
+namespace chromeos {
+
 // Initial size of the renderer. This is contained within a window whose size
 // is set to the size of the image IDR_MAIN_MENU_BUTTON_DROP_DOWN.
 static const int kRendererX = 0;
@@ -105,7 +108,7 @@ void MainMenu::ScheduleCreation() {
 MainMenu::~MainMenu() {
   // NOTE: we leak the menu_rvh_ and popup_ as by the time we get here the
   // message loop and notification services have been shutdown.
-  // TODO(sky); fix this.
+  // TODO(sky): fix this.
   // menu_rvh_->Shutdown();
   // popup_->CloseNow();
 }
@@ -282,3 +285,5 @@ void MainMenu::TabContentsDelegateImpl::OpenURLFromTab(
 void MainMenu::LoadTask::Run() {
   MainMenu::Get();
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/main_menu.h b/chrome/browser/chromeos/main_menu.h
index c432c4b..10646e9 100644
--- a/chrome/browser/chromeos/main_menu.h
+++ b/chrome/browser/chromeos/main_menu.h
@@ -25,6 +25,8 @@ namespace views {
 class WidgetGtk;
 }
 
+namespace chromeos {
+
 // MainMenu manages showing the main menu. The menu is currently an HTML page.
 // When the user clicks a link on the page a new tab is added to the current
 // browser and the menu is hidden.
@@ -201,4 +203,6 @@ class MainMenu : public RenderViewHostDelegate,
   DISALLOW_COPY_AND_ASSIGN(MainMenu);
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_CHROMEOS_VERSION_LOADER_H_
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_MAIN_MENU_H_
diff --git a/chrome/browser/chromeos/cros_network_library.cc b/chrome/browser/chromeos/network_library.cc
index 254d58f..e4599a1 100644
--- a/chrome/browser/chromeos/cros_network_library.cc
+++ b/chrome/browser/chromeos/network_library.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/cros_network_library.h"
+#include "chrome/browser/chromeos/network_library.h"
 
 #include <algorithm>
 
@@ -14,18 +14,20 @@
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 template <>
-struct RunnableMethodTraits<CrosNetworkLibrary> {
-  void RetainCallee(CrosNetworkLibrary* obj) {}
-  void ReleaseCallee(CrosNetworkLibrary* obj) {}
+struct RunnableMethodTraits<chromeos::NetworkLibrary> {
+  void RetainCallee(chromeos::NetworkLibrary* obj) {}
+  void ReleaseCallee(chromeos::NetworkLibrary* obj) {}
 };
 
+namespace chromeos {
+
 ////////////////////////////////////////////////////////////////////////////////
-// CrosNetworkLibrary
+// NetworkLibrary
 
 // static
-const int CrosNetworkLibrary::kNetworkTrafficeTimerSecs = 1;
+const int NetworkLibrary::kNetworkTrafficeTimerSecs = 1;
 
-CrosNetworkLibrary::CrosNetworkLibrary()
+NetworkLibrary::NetworkLibrary()
     : traffic_type_(0),
       ethernet_connected_(false) {
   if (CrosLibrary::loaded()) {
@@ -34,7 +36,7 @@ CrosNetworkLibrary::CrosNetworkLibrary()
   g_url_request_job_tracker.AddObserver(this);
 }
 
-CrosNetworkLibrary::~CrosNetworkLibrary() {
+NetworkLibrary::~NetworkLibrary() {
   if (CrosLibrary::loaded()) {
     chromeos::DisconnectNetworkStatus(network_status_connection_);
   }
@@ -42,45 +44,45 @@ CrosNetworkLibrary::~CrosNetworkLibrary() {
 }
 
 // static
-CrosNetworkLibrary* CrosNetworkLibrary::Get() {
-  return Singleton<CrosNetworkLibrary>::get();
+NetworkLibrary* NetworkLibrary::Get() {
+  return Singleton<NetworkLibrary>::get();
 }
 
 // static
-bool CrosNetworkLibrary::loaded() {
+bool NetworkLibrary::loaded() {
   return CrosLibrary::loaded();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// CrosNetworkLibrary, URLRequestJobTracker::JobObserver implementation:
+// NetworkLibrary, URLRequestJobTracker::JobObserver implementation:
 
-void CrosNetworkLibrary::OnJobAdded(URLRequestJob* job) {
+void NetworkLibrary::OnJobAdded(URLRequestJob* job) {
   CheckNetworkTraffic(false);
 }
 
-void CrosNetworkLibrary::OnJobRemoved(URLRequestJob* job) {
+void NetworkLibrary::OnJobRemoved(URLRequestJob* job) {
   CheckNetworkTraffic(false);
 }
 
-void CrosNetworkLibrary::OnJobDone(URLRequestJob* job,
-                                   const URLRequestStatus& status) {
+void NetworkLibrary::OnJobDone(URLRequestJob* job,
+                               const URLRequestStatus& status) {
   CheckNetworkTraffic(false);
 }
 
-void CrosNetworkLibrary::OnJobRedirect(URLRequestJob* job, const GURL& location,
-                                       int status_code) {
+void NetworkLibrary::OnJobRedirect(URLRequestJob* job, const GURL& location,
+                                   int status_code) {
   CheckNetworkTraffic(false);
 }
 
-void CrosNetworkLibrary::OnBytesRead(URLRequestJob* job, int byte_count) {
+void NetworkLibrary::OnBytesRead(URLRequestJob* job, int byte_count) {
   CheckNetworkTraffic(true);
 }
 
-void CrosNetworkLibrary::AddObserver(Observer* observer) {
+void NetworkLibrary::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
-void CrosNetworkLibrary::RemoveObserver(Observer* observer) {
+void NetworkLibrary::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
@@ -98,8 +100,8 @@ static const char* GetEncryptionString(chromeos::EncryptionType encryption) {
   return "none";
 }
 
-void CrosNetworkLibrary::ConnectToWifiNetwork(WifiNetwork network,
-                                              const string16& password) {
+void NetworkLibrary::ConnectToWifiNetwork(WifiNetwork network,
+                                          const string16& password) {
   if (CrosLibrary::loaded()) {
     // This call kicks off a request to connect to this network, the results of
     // which we'll hear about through the monitoring we've set up in Init();
@@ -111,9 +113,9 @@ void CrosNetworkLibrary::ConnectToWifiNetwork(WifiNetwork network,
 }
 
 // static
-void CrosNetworkLibrary::NetworkStatusChangedHandler(void* object,
+void NetworkLibrary::NetworkStatusChangedHandler(void* object,
     const chromeos::ServiceStatus& service_status) {
-  CrosNetworkLibrary* network = static_cast<CrosNetworkLibrary*>(object);
+  NetworkLibrary* network = static_cast<NetworkLibrary*>(object);
   WifiNetworkVector networks;
   bool ethernet_connected;
   ParseNetworks(service_status, &networks, &ethernet_connected);
@@ -121,7 +123,7 @@ void CrosNetworkLibrary::NetworkStatusChangedHandler(void* object,
 }
 
 // static
-void CrosNetworkLibrary::ParseNetworks(
+void NetworkLibrary::ParseNetworks(
     const chromeos::ServiceStatus& service_status, WifiNetworkVector* networks,
     bool* ethernet_connected) {
   *ethernet_connected = false;
@@ -150,7 +152,7 @@ void CrosNetworkLibrary::ParseNetworks(
   }
 }
 
-void CrosNetworkLibrary::Init() {
+void NetworkLibrary::Init() {
   // First, get the currently available networks.  This data is cached
   // on the connman side, so the call should be quick.
   chromeos::ServiceStatus* service_status = chromeos::GetAvailableNetworks();
@@ -168,14 +170,14 @@ void CrosNetworkLibrary::Init() {
       &NetworkStatusChangedHandler, this);
 }
 
-void CrosNetworkLibrary::UpdateNetworkStatus(
+void NetworkLibrary::UpdateNetworkStatus(
     const WifiNetworkVector& networks, bool ethernet_connected) {
   // Make sure we run on UI thread.
   if (!ChromeThread::CurrentlyOn(ChromeThread::UI)) {
     ChromeThread::PostTask(
         ChromeThread::UI, FROM_HERE,
         NewRunnableMethod(this,
-            &CrosNetworkLibrary::UpdateNetworkStatus, networks,
+            &NetworkLibrary::UpdateNetworkStatus, networks,
             ethernet_connected));
     return;
   }
@@ -194,7 +196,7 @@ void CrosNetworkLibrary::UpdateNetworkStatus(
   FOR_EACH_OBSERVER(Observer, observers_, NetworkChanged(this));
 }
 
-void CrosNetworkLibrary::CheckNetworkTraffic(bool download) {
+void NetworkLibrary::CheckNetworkTraffic(bool download) {
   // If we already have a pending upload and download notification, then
   // shortcut and return.
   if (traffic_type_ == (Observer::TRAFFIC_DOWNLOAD | Observer::TRAFFIC_UPLOAD))
@@ -219,19 +221,21 @@ void CrosNetworkLibrary::CheckNetworkTraffic(bool download) {
   // running, then start a new timer.
   if (traffic_type_ && !timer_.IsRunning()) {
     timer_.Start(base::TimeDelta::FromSeconds(kNetworkTrafficeTimerSecs), this,
-                 &CrosNetworkLibrary::NetworkTrafficTimerFired);
+                 &NetworkLibrary::NetworkTrafficTimerFired);
   }
 }
 
-void CrosNetworkLibrary:: NetworkTrafficTimerFired() {
+void NetworkLibrary:: NetworkTrafficTimerFired() {
   ChromeThread::PostTask(
       ChromeThread::UI, FROM_HERE,
-      NewRunnableMethod(this, &CrosNetworkLibrary::NotifyNetworkTraffic,
+      NewRunnableMethod(this, &NetworkLibrary::NotifyNetworkTraffic,
                         traffic_type_));
   // Reset traffic type so that we don't send the same data next time.
   traffic_type_ = 0;
 }
 
-void CrosNetworkLibrary::NotifyNetworkTraffic(int traffic_type) {
+void NetworkLibrary::NotifyNetworkTraffic(int traffic_type) {
   FOR_EACH_OBSERVER(Observer, observers_, NetworkTraffic(this, traffic_type));
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/cros_network_library.h b/chrome/browser/chromeos/network_library.h
index 29d6ae2..8c67332 100644
--- a/chrome/browser/chromeos/cros_network_library.h
+++ b/chrome/browser/chromeos/network_library.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_NETWORK_LIBRARY_H_
+#define CHROME_BROWSER_CHROMEOS_NETWORK_LIBRARY_H_
 
 #include <string>
 #include <vector>
@@ -16,6 +16,8 @@
 #include "net/url_request/url_request_job_tracker.h"
 #include "third_party/cros/chromeos_network.h"
 
+namespace chromeos {
+
 struct WifiNetwork {
   WifiNetwork()
       : encrypted(false),
@@ -52,8 +54,8 @@ typedef std::vector<WifiNetwork> WifiNetworkVector;
 
 // This class handles the interaction with the ChromeOS network library APIs.
 // Classes can add themselves as observers. Users can get an instance of this
-// library class like this: CrosNetworkLibrary::Get()
-class CrosNetworkLibrary : public URLRequestJobTracker::JobObserver {
+// library class like this: NetworkLibrary::Get()
+class NetworkLibrary : public URLRequestJobTracker::JobObserver {
  public:
   class Observer {
    public:
@@ -64,15 +66,15 @@ class CrosNetworkLibrary : public URLRequestJobTracker::JobObserver {
     } TrafficTypeMasks;
 
     // Called when the network has changed. (wifi networks, and ethernet)
-    virtual void NetworkChanged(CrosNetworkLibrary* obj) = 0;
+    virtual void NetworkChanged(NetworkLibrary* obj) = 0;
 
     // Called when network traffic has been detected.
     // Takes a bitfield of TrafficTypeMasks.
-    virtual void NetworkTraffic(CrosNetworkLibrary* obj, int traffic_type) = 0;
+    virtual void NetworkTraffic(NetworkLibrary* obj, int traffic_type) = 0;
   };
 
-  // This gets the singleton CrosNetworkLibrary
-  static CrosNetworkLibrary* Get();
+  // This gets the singleton NetworkLibrary
+  static NetworkLibrary* Get();
 
   // Returns true if the ChromeOS library was loaded.
   static bool loaded();
@@ -100,10 +102,10 @@ class CrosNetworkLibrary : public URLRequestJobTracker::JobObserver {
   void ConnectToWifiNetwork(WifiNetwork network, const string16& password);
 
  private:
-  friend struct DefaultSingletonTraits<CrosNetworkLibrary>;
+  friend struct DefaultSingletonTraits<NetworkLibrary>;
 
-  CrosNetworkLibrary();
-  ~CrosNetworkLibrary();
+  NetworkLibrary();
+  ~NetworkLibrary();
 
   // This method is called when there's a change in network status.
   // This method is called on a background thread.
@@ -148,7 +150,7 @@ class CrosNetworkLibrary : public URLRequestJobTracker::JobObserver {
 
   // Timer for sending NetworkTraffic notification every
   // kNetworkTrafficeTimerSecs seconds.
-  base::OneShotTimer<CrosNetworkLibrary> timer_;
+  base::OneShotTimer<NetworkLibrary> timer_;
 
   // The current traffic type that will be sent out for the next NetworkTraffic
   // notification. This is a bitfield of TrafficTypeMasks.
@@ -166,7 +168,9 @@ class CrosNetworkLibrary : public URLRequestJobTracker::JobObserver {
   // The current connected (or connecting) wifi network.
   WifiNetwork wifi_;
 
-  DISALLOW_COPY_AND_ASSIGN(CrosNetworkLibrary);
+  DISALLOW_COPY_AND_ASSIGN(NetworkLibrary);
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_NETWORK_LIBRARY_H_
diff --git a/chrome/browser/chromeos/network_menu_button.cc b/chrome/browser/chromeos/network_menu_button.cc
index e91a42b..75174d9 100644
--- a/chrome/browser/chromeos/network_menu_button.cc
+++ b/chrome/browser/chromeos/network_menu_button.cc
@@ -15,6 +15,8 @@
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
+namespace chromeos {
+
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton
 
@@ -37,12 +39,12 @@ NetworkMenuButton::NetworkMenuButton(gfx::NativeWindow browser_window)
   animation_downloading_.SetTweenType(SlideAnimation::NONE);
   animation_uploading_.SetThrobDuration(kThrobDuration);
   animation_uploading_.SetTweenType(SlideAnimation::NONE);
-  NetworkChanged(CrosNetworkLibrary::Get());
-  CrosNetworkLibrary::Get()->AddObserver(this);
+  NetworkChanged(NetworkLibrary::Get());
+  NetworkLibrary::Get()->AddObserver(this);
 }
 
 NetworkMenuButton::~NetworkMenuButton() {
-  CrosNetworkLibrary::Get()->RemoveObserver(this);
+  NetworkLibrary::Get()->RemoveObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -68,7 +70,7 @@ string16 NetworkMenuButton::GetLabelAt(int index) const {
 bool NetworkMenuButton::IsItemCheckedAt(int index) const {
   // WifiNetwork that we are connected to (or connecting to) is checked.
   return wifi_networks_.empty() ? false :
-      wifi_networks_[index].ssid == CrosNetworkLibrary::Get()->wifi_ssid();
+      wifi_networks_[index].ssid == NetworkLibrary::Get()->wifi_ssid();
 }
 
 bool NetworkMenuButton::IsEnabledAt(int index) const {
@@ -80,7 +82,7 @@ void NetworkMenuButton::ActivatedAt(int index) {
   if (refreshing_menu_)
     return;
 
-  CrosNetworkLibrary* cros = CrosNetworkLibrary::Get();
+  NetworkLibrary* cros = NetworkLibrary::Get();
 
   // If clicked on a network that we are already connected to or we are
   // currently trying to connect to, then do nothing.
@@ -113,8 +115,8 @@ void NetworkMenuButton::ActivatedAt(int index) {
 
 bool NetworkMenuButton::OnPasswordDialogAccept(const std::string& ssid,
                                                const string16& password) {
-  CrosNetworkLibrary::Get()->ConnectToWifiNetwork(activated_wifi_network_,
-                                                  password);
+  NetworkLibrary::Get()->ConnectToWifiNetwork(activated_wifi_network_,
+                                              password);
   return true;
 }
 
@@ -142,7 +144,7 @@ void NetworkMenuButton::DrawIcon(gfx::Canvas* canvas) {
   canvas->DrawBitmapInt(icon(), 0, 0);
 
   // If wifi, we draw the wifi signal bars.
-  CrosNetworkLibrary* cros = CrosNetworkLibrary::Get();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   if (cros->wifi_connecting() ||
           (!cros->ethernet_connected() && !cros->wifi_ssid().empty())) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ -224,7 +226,7 @@ void NetworkMenuButton::DrawIcon(gfx::Canvas* canvas) {
 // NetworkMenuButton, views::ViewMenuDelegate implementation:
 
 void NetworkMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
-  wifi_networks_ = CrosNetworkLibrary::Get()->wifi_networks();
+  wifi_networks_ = NetworkLibrary::Get()->wifi_networks();
   refreshing_menu_ = true;
   network_menu_.Rebuild();
   network_menu_.UpdateStates();
@@ -233,9 +235,9 @@ void NetworkMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// NetworkMenuButton, CrosNetworkLibrary::Observer implementation:
+// NetworkMenuButton, NetworkLibrary::Observer implementation:
 
-void NetworkMenuButton::NetworkChanged(CrosNetworkLibrary* cros) {
+void NetworkMenuButton::NetworkChanged(NetworkLibrary* cros) {
   int id = IDR_STATUSBAR_WARNING;
   if (cros->loaded()) {
     id = IDR_STATUSBAR_NETWORK_DISCONNECTED;
@@ -267,8 +269,7 @@ void NetworkMenuButton::NetworkChanged(CrosNetworkLibrary* cros) {
   SchedulePaint();
 }
 
-void NetworkMenuButton::NetworkTraffic(CrosNetworkLibrary* cros,
-                                       int traffic_type) {
+void NetworkMenuButton::NetworkTraffic(NetworkLibrary* cros, int traffic_type) {
   if (!cros->ethernet_connected() && !cros->wifi_ssid().empty() &&
       !cros->wifi_connecting()) {
     // For downloading/uploading animation, we want to force at least one cycle
@@ -280,3 +281,5 @@ void NetworkMenuButton::NetworkTraffic(CrosNetworkLibrary* cros,
       animation_uploading_.StartThrobbing(2);
   }
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/network_menu_button.h b/chrome/browser/chromeos/network_menu_button.h
index c220bd6..d27c241 100644
--- a/chrome/browser/chromeos/network_menu_button.h
+++ b/chrome/browser/chromeos/network_menu_button.h
@@ -9,7 +9,7 @@
 
 #include "app/throb_animation.h"
 #include "base/timer.h"
-#include "chrome/browser/chromeos/cros_network_library.h"
+#include "chrome/browser/chromeos/network_library.h"
 #include "chrome/browser/chromeos/password_dialog_view.h"
 #include "chrome/browser/chromeos/status_area_button.h"
 #include "views/controls/menu/menu_2.h"
@@ -22,6 +22,8 @@ namespace gfx {
 class Canvas;
 }
 
+namespace chromeos {
+
 // The network menu button in the status area.
 // This class will handle getting the wifi networks and populating the menu.
 // It will also handle the status icon changing and connecting to another
@@ -30,7 +32,7 @@ class NetworkMenuButton : public StatusAreaButton,
                           public views::ViewMenuDelegate,
                           public views::Menu2Model,
                           public PasswordDialogDelegate,
-                          public CrosNetworkLibrary::Observer {
+                          public NetworkLibrary::Observer {
  public:
   explicit NetworkMenuButton(gfx::NativeWindow browser_window);
   virtual ~NetworkMenuButton();
@@ -61,10 +63,9 @@ class NetworkMenuButton : public StatusAreaButton,
   // AnimationDelegate implementation.
   virtual void AnimationProgressed(const Animation* animation);
 
-  // CrosNetworkLibrary::Observer implementation.
-  virtual void NetworkChanged(CrosNetworkLibrary* obj);
-  virtual void NetworkTraffic(CrosNetworkLibrary* cros,
-                              int traffic_type);
+  // NetworkLibrary::Observer implementation.
+  virtual void NetworkChanged(NetworkLibrary* obj);
+  virtual void NetworkTraffic(NetworkLibrary* cros, int traffic_type);
 
  protected:
   // StatusAreaButton implementation.
@@ -113,4 +114,6 @@ class NetworkMenuButton : public StatusAreaButton,
   DISALLOW_COPY_AND_ASSIGN(NetworkMenuButton);
 };
 
+}  // namespace chromeos
+
 #endif  // CHROME_BROWSER_CHROMEOS_NETWORK_MENU_BUTTON_H_
diff --git a/chrome/browser/chromeos/panel_controller.cc b/chrome/browser/chromeos/panel_controller.cc
index 3b393d2..c0aed6e 100644
--- a/chrome/browser/chromeos/panel_controller.cc
+++ b/chrome/browser/chromeos/panel_controller.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/panel_controller.h"
 
+#include <vector>
+
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/singleton.h"
@@ -28,6 +30,8 @@
 #include "views/widget/widget_gtk.h"
 #include "views/window/window.h"
 
+namespace chromeos {
+
 static int close_button_width;
 static int close_button_height;
 static SkBitmap* close_button_n;
@@ -332,3 +336,4 @@ void PanelController::TitleContentView::OnFocusOut() {
   SchedulePaint();
 }
 
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/panel_controller.h b/chrome/browser/chromeos/panel_controller.h
index 5b3e494..3e20d5d 100644
--- a/chrome/browser/chromeos/panel_controller.h
+++ b/chrome/browser/chromeos/panel_controller.h
@@ -24,6 +24,8 @@ class MouseEvent;
 class WidgetGtk;
 }
 
+namespace chromeos {
+
 // Controls interactions with the WM for popups / panels.
 class PanelController : public views::ButtonListener {
  public:
@@ -123,5 +125,7 @@ class PanelController : public views::ButtonListener {
   DISALLOW_COPY_AND_ASSIGN(PanelController);
 };
 
+}  // namespace chromeos
+
 #endif  // CHROME_BROWSER_CHROMEOS_PANEL_CONTROLLER_H_
 
diff --git a/chrome/browser/chromeos/password_dialog_view.cc b/chrome/browser/chromeos/password_dialog_view.cc
index e744574..0d6f8a0 100644
--- a/chrome/browser/chromeos/password_dialog_view.cc
+++ b/chrome/browser/chromeos/password_dialog_view.cc
@@ -11,6 +11,8 @@
 #include "views/controls/textfield/textfield.h"
 #include "views/window/window.h"
 
+namespace chromeos {
+
 PasswordDialogView::PasswordDialogView(PasswordDialogDelegate* delegate,
                                        const std::string& ssid)
     : delegate_(delegate),
@@ -59,3 +61,5 @@ void PasswordDialogView::Init() {
   password_textfield_ = new views::Textfield(views::Textfield::STYLE_PASSWORD);
   AddChildView(password_textfield_);
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/password_dialog_view.h b/chrome/browser/chromeos/password_dialog_view.h
index e4650a2..e88a1fe 100644
--- a/chrome/browser/chromeos/password_dialog_view.h
+++ b/chrome/browser/chromeos/password_dialog_view.h
@@ -16,6 +16,8 @@ class View;
 class Window;
 }
 
+namespace chromeos {
+
 // Delegate implemented by caller of PasswordDialogView to handle the user
 // interacting with the dialog box.
 class PasswordDialogDelegate {
@@ -70,4 +72,6 @@ class PasswordDialogView : public views::View,
   DISALLOW_COPY_AND_ASSIGN(PasswordDialogView);
 };
 
+}  // namespace chromeos
+
 #endif  // CHROME_BROWSER_CHROMEOS_PASSWORD_DIALOG_VIEW_H_
diff --git a/chrome/browser/chromeos/pipe_reader.cc b/chrome/browser/chromeos/pipe_reader.cc
index 16b9f06..2ed5e7c 100644
--- a/chrome/browser/chromeos/pipe_reader.cc
+++ b/chrome/browser/chromeos/pipe_reader.cc
@@ -6,6 +6,8 @@
 
 #include "base/scoped_ptr.h"
 
+namespace chromeos {
+
 std::string PipeReader::Read(const uint32 bytes_to_read) {
   scoped_array<char> buffer(new char[bytes_to_read]);
   if (pipe_ || (pipe_ = fopen(pipe_name_.c_str(), "r"))) {
@@ -15,3 +17,5 @@ std::string PipeReader::Read(const uint32 bytes_to_read) {
   }
   return std::string();
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/pipe_reader.h b/chrome/browser/chromeos/pipe_reader.h
index 8cd4f25..a2e552d 100644
--- a/chrome/browser/chromeos/pipe_reader.h
+++ b/chrome/browser/chromeos/pipe_reader.h
@@ -7,13 +7,16 @@
 
 #include <fcntl.h>
 #include <stdio.h>
-#include <string>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <string>
+
 #include "base/basictypes.h"
 
+namespace chromeos {
+
 // Given a named pipe, this class reads data from it and returns it as a string.
 // Currently, we are sending login cookies from the Chrome OS login manager to
 // Chrome over a named Unix pipe.  We want to replace this with DBus, but
@@ -48,4 +51,6 @@ class PipeReader {
   DISALLOW_COPY_AND_ASSIGN(PipeReader);
 };
 
+}  // namespace chromeos
+
 #endif  // CHROME_BROWSER_CHROMEOS_PIPE_READER_H_
diff --git a/chrome/browser/chromeos/pipe_reader_unittest.cc b/chrome/browser/chromeos/pipe_reader_unittest.cc
index 1915ae7..619af7f 100644
--- a/chrome/browser/chromeos/pipe_reader_unittest.cc
+++ b/chrome/browser/chromeos/pipe_reader_unittest.cc
@@ -9,6 +9,8 @@
 #include "base/safe_strerror_posix.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace chromeos {
+
 typedef testing::Test PipeReaderTest;
 
 TEST_F(PipeReaderTest, SuccessfulReadTest) {
@@ -96,3 +98,5 @@ TEST_F(PipeReaderTest, SuccessfulMultiLineReadNoEndingNewlineTest) {
     EXPECT_EQ(my_boo, boo);
   }
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/cros_power_library.cc b/chrome/browser/chromeos/power_library.cc
index d8a8e2b..6689d9b 100644
--- a/chrome/browser/chromeos/cros_power_library.cc
+++ b/chrome/browser/chromeos/power_library.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/cros_power_library.h"
+#include "chrome/browser/chromeos/power_library.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ -12,83 +12,85 @@
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 template <>
-struct RunnableMethodTraits<CrosPowerLibrary> {
-  void RetainCallee(CrosPowerLibrary* obj) {}
-  void ReleaseCallee(CrosPowerLibrary* obj) {}
+struct RunnableMethodTraits<chromeos::PowerLibrary> {
+  void RetainCallee(chromeos::PowerLibrary* obj) {}
+  void ReleaseCallee(chromeos::PowerLibrary* obj) {}
 };
 
-CrosPowerLibrary::CrosPowerLibrary() : status_(chromeos::PowerStatus()) {
+namespace chromeos {
+
+PowerLibrary::PowerLibrary() : status_(chromeos::PowerStatus()) {
   if (CrosLibrary::loaded()) {
     Init();
   }
 }
 
-CrosPowerLibrary::~CrosPowerLibrary() {
+PowerLibrary::~PowerLibrary() {
   if (CrosLibrary::loaded()) {
     chromeos::DisconnectPowerStatus(power_status_connection_);
   }
 }
 
 // static
-CrosPowerLibrary* CrosPowerLibrary::Get() {
-  return Singleton<CrosPowerLibrary>::get();
+PowerLibrary* PowerLibrary::Get() {
+  return Singleton<PowerLibrary>::get();
 }
 
 // static
-bool CrosPowerLibrary::loaded() {
+bool PowerLibrary::loaded() {
   return CrosLibrary::loaded();
 }
 
-void CrosPowerLibrary::AddObserver(Observer* observer) {
+void PowerLibrary::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
-void CrosPowerLibrary::RemoveObserver(Observer* observer) {
+void PowerLibrary::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
-bool CrosPowerLibrary::line_power_on() const {
+bool PowerLibrary::line_power_on() const {
   return status_.line_power_on;
 }
 
-bool CrosPowerLibrary::battery_is_present() const {
+bool PowerLibrary::battery_is_present() const {
   return status_.battery_is_present;
 }
 
-bool CrosPowerLibrary::battery_fully_charged() const {
+bool PowerLibrary::battery_fully_charged() const {
   return status_.battery_state == chromeos::BATTERY_STATE_FULLY_CHARGED;
 }
 
-double CrosPowerLibrary::battery_percentage() const {
+double PowerLibrary::battery_percentage() const {
   return status_.battery_percentage;
 }
 
-base::TimeDelta CrosPowerLibrary::battery_time_to_empty() const {
+base::TimeDelta PowerLibrary::battery_time_to_empty() const {
   return base::TimeDelta::FromSeconds(status_.battery_time_to_empty);
 }
 
-base::TimeDelta CrosPowerLibrary::battery_time_to_full() const {
+base::TimeDelta PowerLibrary::battery_time_to_full() const {
   return base::TimeDelta::FromSeconds(status_.battery_time_to_full);
 }
 
 // static
-void CrosPowerLibrary::PowerStatusChangedHandler(void* object,
+void PowerLibrary::PowerStatusChangedHandler(void* object,
     const chromeos::PowerStatus& status) {
-  CrosPowerLibrary* power = static_cast<CrosPowerLibrary*>(object);
+  PowerLibrary* power = static_cast<PowerLibrary*>(object);
   power->UpdatePowerStatus(status);
 }
 
-void CrosPowerLibrary::Init() {
+void PowerLibrary::Init() {
   power_status_connection_ = chromeos::MonitorPowerStatus(
       &PowerStatusChangedHandler, this);
 }
 
-void CrosPowerLibrary::UpdatePowerStatus(const chromeos::PowerStatus& status) {
+void PowerLibrary::UpdatePowerStatus(const chromeos::PowerStatus& status) {
   // Make sure we run on UI thread.
   if (!ChromeThread::CurrentlyOn(ChromeThread::UI)) {
     ChromeThread::PostTask(
         ChromeThread::UI, FROM_HERE,
-        NewRunnableMethod(this, &CrosPowerLibrary::UpdatePowerStatus, status));
+        NewRunnableMethod(this, &PowerLibrary::UpdatePowerStatus, status));
     return;
   }
 
@@ -101,3 +103,5 @@ void CrosPowerLibrary::UpdatePowerStatus(const chromeos::PowerStatus& status) {
   status_ = status;
   FOR_EACH_OBSERVER(Observer, observers_, PowerChanged(this));
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/cros_power_library.h b/chrome/browser/chromeos/power_library.h
index f53a477..a44149f 100644
--- a/chrome/browser/chromeos/cros_power_library.h
+++ b/chrome/browser/chromeos/power_library.h
@@ -2,26 +2,28 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_CROS_POWER_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_POWER_LIBRARY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_POWER_LIBRARY_H_
+#define CHROME_BROWSER_CHROMEOS_POWER_LIBRARY_H_
 
 #include "base/observer_list.h"
 #include "base/singleton.h"
 #include "base/time.h"
 #include "third_party/cros/chromeos_power.h"
 
+namespace chromeos {
+
 // This class handles the interaction with the ChromeOS power library APIs.
 // Classes can add themselves as observers. Users can get an instance of this
-// library class like this: CrosPowerLibrary::Get()
-class CrosPowerLibrary {
+// library class like this: PowerLibrary::Get()
+class PowerLibrary {
  public:
   class Observer {
    public:
-    virtual void PowerChanged(CrosPowerLibrary* obj) = 0;
+    virtual void PowerChanged(PowerLibrary* obj) = 0;
   };
 
-  // This gets the singleton CrosPowerLibrary
-  static CrosPowerLibrary* Get();
+  // This gets the singleton PowerLibrary
+  static PowerLibrary* Get();
 
   // Returns true if the ChromeOS library was loaded.
   static bool loaded();
@@ -48,10 +50,10 @@ class CrosPowerLibrary {
   base::TimeDelta battery_time_to_full() const;
 
  private:
-  friend struct DefaultSingletonTraits<CrosPowerLibrary>;
+  friend struct DefaultSingletonTraits<PowerLibrary>;
 
-  CrosPowerLibrary();
-  ~CrosPowerLibrary();
+  PowerLibrary();
+  ~PowerLibrary();
 
   // This method is called when there's a change in power status.
   // This method is called on a background thread.
@@ -74,7 +76,9 @@ class CrosPowerLibrary {
   // The latest power status.
   chromeos::PowerStatus status_;
 
-  DISALLOW_COPY_AND_ASSIGN(CrosPowerLibrary);
+  DISALLOW_COPY_AND_ASSIGN(PowerLibrary);
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_CROS_POWER_LIBRARY_H_
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_POWER_LIBRARY_H_
diff --git a/chrome/browser/chromeos/power_menu_button.cc b/chrome/browser/chromeos/power_menu_button.cc
index 1ded368..7947529 100644
--- a/chrome/browser/chromeos/power_menu_button.cc
+++ b/chrome/browser/chromeos/power_menu_button.cc
@@ -10,6 +10,8 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
+namespace chromeos {
+
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton
 
@@ -20,11 +22,11 @@ PowerMenuButton::PowerMenuButton()
     : StatusAreaButton(this),
       ALLOW_THIS_IN_INITIALIZER_LIST(power_menu_(this)) {
   UpdateIcon();
-  CrosPowerLibrary::Get()->AddObserver(this);
+  PowerLibrary::Get()->AddObserver(this);
 }
 
 PowerMenuButton::~PowerMenuButton() {
-  CrosPowerLibrary::Get()->RemoveObserver(this);
+  PowerLibrary::Get()->RemoveObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -39,7 +41,7 @@ views::Menu2Model::ItemType PowerMenuButton::GetTypeAt(int index) const {
 }
 
 string16 PowerMenuButton::GetLabelAt(int index) const {
-  CrosPowerLibrary* cros = CrosPowerLibrary::Get();
+  PowerLibrary* cros = PowerLibrary::Get();
   // The first item shows the percentage of battery left.
   if (index == 0) {
     // If fully charged, always show 100% even if internal number is a bit less.
@@ -91,16 +93,16 @@ void PowerMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// PowerMenuButton, CrosPowerLibrary::Observer implementation:
+// PowerMenuButton, PowerLibrary::Observer implementation:
 
-void PowerMenuButton::PowerChanged(CrosPowerLibrary* obj) {
+void PowerMenuButton::PowerChanged(PowerLibrary* obj) {
   UpdateIcon();
 }
 
 void PowerMenuButton::UpdateIcon() {
-  CrosPowerLibrary* cros = CrosPowerLibrary::Get();
+  PowerLibrary* cros = PowerLibrary::Get();
   int id = IDR_STATUSBAR_BATTERY_UNKNOWN;
-  if (CrosPowerLibrary::loaded()) {
+  if (PowerLibrary::loaded()) {
     if (!cros->battery_is_present()) {
       id = IDR_STATUSBAR_BATTERY_MISSING;
     } else if (cros->line_power_on() && cros->battery_fully_charged()) {
@@ -127,3 +129,5 @@ void PowerMenuButton::UpdateIcon() {
   SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed(id));
   SchedulePaint();
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/power_menu_button.h b/chrome/browser/chromeos/power_menu_button.h
index a250b26..162990e 100644
--- a/chrome/browser/chromeos/power_menu_button.h
+++ b/chrome/browser/chromeos/power_menu_button.h
@@ -5,20 +5,21 @@
 #ifndef CHROME_BROWSER_CHROMEOS_POWER_MENU_BUTTON_H_
 #define CHROME_BROWSER_CHROMEOS_POWER_MENU_BUTTON_H_
 
-#include "chrome/browser/chromeos/cros_power_library.h"
+#include "chrome/browser/chromeos/power_library.h"
 #include "chrome/browser/chromeos/status_area_button.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/view_menu_delegate.h"
 
-class CrosPowerLibrary;
 class SkBitmap;
 
+namespace chromeos {
+
 // The power menu button in the status area.
 // This class will handle getting the power status and populating the menu.
 class PowerMenuButton : public StatusAreaButton,
                         public views::ViewMenuDelegate,
                         public views::Menu2Model,
-                        public CrosPowerLibrary::Observer {
+                        public PowerLibrary::Observer {
  public:
   PowerMenuButton();
   virtual ~PowerMenuButton();
@@ -41,8 +42,8 @@ class PowerMenuButton : public StatusAreaButton,
   virtual void ActivatedAt(int index) {}
   virtual void MenuWillShow() {}
 
-  // CrosPowerLibrary::Observer implementation.
-  virtual void PowerChanged(CrosPowerLibrary* obj);
+  // PowerLibrary::Observer implementation.
+  virtual void PowerChanged(PowerLibrary* obj);
 
  private:
   // views::ViewMenuDelegate implementation.
@@ -60,4 +61,6 @@ class PowerMenuButton : public StatusAreaButton,
   DISALLOW_COPY_AND_ASSIGN(PowerMenuButton);
 };
 
+}  // namespace chromeos
+
 #endif  // CHROME_BROWSER_CHROMEOS_POWER_MENU_BUTTON_H_
diff --git a/chrome/browser/chromeos/settings_contents_view.cc b/chrome/browser/chromeos/settings_contents_view.cc
index 6240077..0c1998d 100644
--- a/chrome/browser/chromeos/settings_contents_view.cc
+++ b/chrome/browser/chromeos/settings_contents_view.cc
@@ -14,7 +14,7 @@
 #include "base/basictypes.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
-#include "chrome/browser/chromeos/cros_network_library.h"
+#include "chrome/browser/chromeos/network_library.h"
 #include "chrome/browser/chromeos/password_dialog_view.h"
 #include "chrome/common/pref_member.h"
 #include "chrome/common/pref_names.h"
@@ -33,7 +33,7 @@
 using views::GridLayout;
 using views::ColumnSet;
 
-namespace {
+namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
 // SettingsContentsSection
@@ -255,7 +255,7 @@ void DateTimeSection::SelectTimeZone(const std::wstring& id) {
 class NetworkSection : public SettingsContentsSection,
                        public views::Combobox::Listener,
                        public PasswordDialogDelegate,
-                       public CrosNetworkLibrary::Observer {
+                       public NetworkLibrary::Observer {
  public:
   explicit NetworkSection(Profile* profile);
   virtual ~NetworkSection();
@@ -270,10 +270,9 @@ class NetworkSection : public SettingsContentsSection,
   virtual bool OnPasswordDialogAccept(const std::string& ssid,
                                       const string16& password);
 
-  // CrosNetworkLibrary::Observer implementation.
-  virtual void NetworkChanged(CrosNetworkLibrary* obj);
-  virtual void NetworkTraffic(CrosNetworkLibrary* obj,
-                              int traffic_type) {}
+  // NetworkLibrary::Observer implementation.
+  virtual void NetworkChanged(NetworkLibrary* obj);
+  virtual void NetworkTraffic(NetworkLibrary* obj, int traffic_type) {}
 
  protected:
   // SettingsContentsSection overrides:
@@ -284,7 +283,7 @@ class NetworkSection : public SettingsContentsSection,
   class WifiNetworkComboModel : public ComboboxModel {
    public:
     WifiNetworkComboModel() {
-      wifi_networks_ = CrosNetworkLibrary::Get()->wifi_networks();
+      wifi_networks_ = NetworkLibrary::Get()->wifi_networks();
     }
 
     virtual int GetItemCount() {
@@ -342,11 +341,11 @@ NetworkSection::NetworkSection(Profile* profile)
                               IDS_OPTIONS_SETTINGS_SECTION_TITLE_NETWORK),
       wifi_ssid_combobox_(NULL),
       last_selected_wifi_ssid_index_(0) {
-  CrosNetworkLibrary::Get()->AddObserver(this);
+  NetworkLibrary::Get()->AddObserver(this);
 }
 
 NetworkSection::~NetworkSection() {
-  CrosNetworkLibrary::Get()->RemoveObserver(this);
+  NetworkLibrary::Get()->RemoveObserver(this);
 }
 
 void NetworkSection::ItemChanged(views::Combobox* sender,
@@ -375,7 +374,7 @@ void NetworkSection::ItemChanged(views::Combobox* sender,
     window->SetIsAlwaysOnTop(true);
     window->Show();
   } else {
-    CrosNetworkLibrary::Get()->ConnectToWifiNetwork(activated_wifi_network_,
+    NetworkLibrary::Get()->ConnectToWifiNetwork(activated_wifi_network_,
                                                     string16());
   }
 }
@@ -388,12 +387,12 @@ bool NetworkSection::OnPasswordDialogCancel() {
 
 bool NetworkSection::OnPasswordDialogAccept(const std::string& ssid,
                                             const string16& password) {
-  CrosNetworkLibrary::Get()->ConnectToWifiNetwork(activated_wifi_network_,
+  NetworkLibrary::Get()->ConnectToWifiNetwork(activated_wifi_network_,
                                                   password);
   return true;
 }
 
-void NetworkSection::NetworkChanged(CrosNetworkLibrary* obj) {
+void NetworkSection::NetworkChanged(NetworkLibrary* obj) {
   SelectWifi(obj->wifi_ssid());
 }
 
@@ -407,7 +406,7 @@ void NetworkSection::InitContents(GridLayout* layout) {
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   // Select the initial connected wifi network.
-  SelectWifi(CrosNetworkLibrary::Get()->wifi_ssid());
+  SelectWifi(NetworkLibrary::Get()->wifi_ssid());
 }
 
 void NetworkSection::SelectWifi(const std::string& wifi_ssid) {
@@ -580,8 +579,6 @@ void TouchpadSection::NotifyPrefChanged(const std::wstring* pref_name) {
   }
 }
 
-}  // namespace
-
 ////////////////////////////////////////////////////////////////////////////////
 // SettingsContentsView
 
@@ -607,3 +604,5 @@ void SettingsContentsView::InitControlLayout() {
   layout->AddView(new TouchpadSection(profile()));
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/settings_contents_view.h b/chrome/browser/chromeos/settings_contents_view.h
index 2a35028..06d91c0 100644
--- a/chrome/browser/chromeos/settings_contents_view.h
+++ b/chrome/browser/chromeos/settings_contents_view.h
@@ -7,6 +7,8 @@
 
 #include "chrome/browser/views/options/options_page_view.h"
 
+namespace chromeos {
+
 // Contents of the settings page for Chrome OS
 class SettingsContentsView : public OptionsPageView {
  public:
@@ -20,4 +22,6 @@ class SettingsContentsView : public OptionsPageView {
   DISALLOW_COPY_AND_ASSIGN(SettingsContentsView);
 };
 
+}  // namespace chromeos
+
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_CONTENTS_VIEW_H_
diff --git a/chrome/browser/chromeos/settings_page_view.cc b/chrome/browser/chromeos/settings_page_view.cc
index 0702928..87aa7ee 100644
--- a/chrome/browser/chromeos/settings_page_view.cc
+++ b/chrome/browser/chromeos/settings_page_view.cc
@@ -10,6 +10,8 @@
 #include "views/fill_layout.h"
 #include "views/widget/widget_gtk.h"
 
+namespace chromeos {
+
 SettingsPageView::SettingsPageView(Profile* profile)
     : OptionsPageView(profile) {
   SetLayoutManager(new views::FillLayout());
@@ -39,3 +41,5 @@ void SettingsPageView::InitControlLayout() {
   settings_contents_view_ = new SettingsContentsView(profile());
   AddChildView(settings_contents_view_);
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/settings_page_view.h b/chrome/browser/chromeos/settings_page_view.h
index 3d7004d..a908b2a 100644
--- a/chrome/browser/chromeos/settings_page_view.h
+++ b/chrome/browser/chromeos/settings_page_view.h
@@ -9,6 +9,8 @@
 
 #include "chrome/browser/views/options/options_page_view.h"
 
+namespace chromeos {
+
 class SettingsContentsView;
 
 // Settings page for Chrome OS.
@@ -31,4 +33,6 @@ class SettingsPageView : public OptionsPageView {
   DISALLOW_COPY_AND_ASSIGN(SettingsPageView);
 };
 
+}  // namespace chromeos
+
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_PAGE_VIEW_H_
diff --git a/chrome/browser/chromeos/status_area_button.cc b/chrome/browser/chromeos/status_area_button.cc
index 27549dc..57f66da 100644
--- a/chrome/browser/chromeos/status_area_button.cc
+++ b/chrome/browser/chromeos/status_area_button.cc
@@ -11,6 +11,8 @@
 #include "views/border.h"
 #include "views/view.h"
 
+namespace chromeos {
+
 ////////////////////////////////////////////////////////////////////////////////
 // StatusAreaButton
 
@@ -46,3 +48,5 @@ void StatusAreaButton::Paint(gfx::Canvas* canvas, bool for_drag) {
 void StatusAreaButton::DrawIcon(gfx::Canvas* canvas) {
   canvas->DrawBitmapInt(icon(), 0, 0);
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/status_area_button.h b/chrome/browser/chromeos/status_area_button.h
index a68495d..0647661 100644
--- a/chrome/browser/chromeos/status_area_button.h
+++ b/chrome/browser/chromeos/status_area_button.h
@@ -8,6 +8,8 @@
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/view_menu_delegate.h"
 
+namespace chromeos {
+
 // Button to be used to represent status and allow menus to be popped up.
 // Shows current button state by drawing a border around the current icon.
 class StatusAreaButton : public views::MenuButton {
@@ -25,4 +27,6 @@ class StatusAreaButton : public views::MenuButton {
   DISALLOW_COPY_AND_ASSIGN(StatusAreaButton);
 };
 
+}  // namespace chromeos
+
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_AREA_BUTTON_H_
diff --git a/chrome/browser/chromeos/status_area_view.cc b/chrome/browser/chromeos/status_area_view.cc
index 62bcd68..942e535 100755
--- a/chrome/browser/chromeos/status_area_view.cc
+++ b/chrome/browser/chromeos/status_area_view.cc
@@ -27,7 +27,7 @@
 #include "views/controls/menu/menu.h"
 #include "views/controls/menu/simple_menu_model.h"
 
-namespace {
+namespace chromeos {
 
 // Number of pixels to pad on the left border.
 const int kLeftBorder = 1;
@@ -114,8 +114,6 @@ class OptionsMenuModel : public views::SimpleMenuModel,
   DISALLOW_COPY_AND_ASSIGN(OptionsMenuModel);
 };
 
-}  // namespace
-
 // Default to opening new tabs on the left.
 StatusAreaView::OpenTabsMode StatusAreaView::open_tabs_mode_ =
     StatusAreaView::OPEN_TABS_ON_LEFT;
@@ -282,3 +280,5 @@ void StatusAreaView::RunMenu(views::View* source, const gfx::Point& pt) {
   CreateAppMenu();
   app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/status_area_view.h b/chrome/browser/chromeos/status_area_view.h
index 9428697..bb815fe 100644
--- a/chrome/browser/chromeos/status_area_view.h
+++ b/chrome/browser/chromeos/status_area_view.h
@@ -12,6 +12,9 @@
 #include "views/view.h"
 
 class Browser;
+
+namespace chromeos {
+
 class ClockMenuButton;
 class NetworkMenuButton;
 class PowerMenuButton;
@@ -78,4 +81,6 @@ class StatusAreaView : public views::View,
   DISALLOW_COPY_AND_ASSIGN(StatusAreaView);
 };
 
+}  // namespace chromeos
+
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_AREA_VIEW_H_
diff --git a/chrome/browser/chromeos/chromeos_version_loader.cc b/chrome/browser/chromeos/version_loader.cc
index a7b4018..9475205 100644
--- a/chrome/browser/chromeos/chromeos_version_loader.cc
+++ b/chrome/browser/chromeos/version_loader.cc
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/chromeos_version_loader.h"
+#include "chrome/browser/chromeos/version_loader.h"
+
+#include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ -11,18 +13,20 @@
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
 
+namespace chromeos {
+
 // Beginning of line we look for that gives version number.
 static const char kPrefix[] = "CHROMEOS_RELEASE_DESCRIPTION=";
 
 // File to look for version number in.
 static const char kPath[] = "/etc/lsb-release";
 
-ChromeOSVersionLoader::ChromeOSVersionLoader() : backend_(new Backend()) {
+VersionLoader::VersionLoader() : backend_(new Backend()) {
 }
 
-ChromeOSVersionLoader::Handle ChromeOSVersionLoader::GetVersion(
+VersionLoader::Handle VersionLoader::GetVersion(
     CancelableRequestConsumerBase* consumer,
-    ChromeOSVersionLoader::GetVersionCallback* callback) {
+    VersionLoader::GetVersionCallback* callback) {
   if (!g_browser_process->file_thread()) {
     // This should only happen if Chrome is shutting down, so we don't do
     // anything.
@@ -40,7 +44,7 @@ ChromeOSVersionLoader::Handle ChromeOSVersionLoader::GetVersion(
 }
 
 // static
-std::string ChromeOSVersionLoader::ParseVersion(const std::string& contents) {
+std::string VersionLoader::ParseVersion(const std::string& contents) {
   // The file contains lines such as:
   // XXX=YYY
   // AAA=ZZZ
@@ -62,7 +66,7 @@ std::string ChromeOSVersionLoader::ParseVersion(const std::string& contents) {
   return std::string();
 }
 
-void ChromeOSVersionLoader::Backend::GetVersion(
+void VersionLoader::Backend::GetVersion(
     scoped_refptr<GetVersionRequest> request) {
   if (request->canceled())
     return;
@@ -74,3 +78,5 @@ void ChromeOSVersionLoader::Backend::GetVersion(
   request->ForwardResult(GetVersionCallback::TupleType(request->handle(),
                                                        version));
 }
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/chromeos_version_loader.h b/chrome/browser/chromeos/version_loader.h
index 1dccd31..f118934 100644
--- a/chrome/browser/chromeos/chromeos_version_loader.h
+++ b/chrome/browser/chromeos/version_loader.h
@@ -2,29 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_CHROMEOS_VERSION_LOADER_H_
-#define CHROME_BROWSER_CHROMEOS_CHROMEOS_VERSION_LOADER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_VERSION_LOADER_H_
+#define CHROME_BROWSER_CHROMEOS_VERSION_LOADER_H_
+
+#include <string>
 
 #include "chrome/browser/cancelable_request.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class FilePath;
 
+namespace chromeos {
+
 // ChromeOSVersionLoader loads the version of Chrome OS from the file system.
 // Loading is done asynchronously on the file thread. Once loaded,
 // ChromeOSVersionLoader callsback to a method of your choice with the version
 // (or an empty string if the version couldn't be found).
 // To use ChromeOSVersionLoader do the following:
 //
-// . In your class define a member field of type ChromeOSVersionLoader and
+// . In your class define a member field of type chromeos::VersionLoader and
 //   CancelableRequestConsumerBase.
 // . Define the callback method, something like:
-//   void OnGetChromeOSVersion(ChromeOSVersionLoader::Handle,
+//   void OnGetChromeOSVersion(chromeos::VersionLoader::Handle,
 //                             std::string version);
 // . When you want the version invoke:  loader.GetVersion(&consumer, callback);
-class ChromeOSVersionLoader : public CancelableRequestProvider {
+class VersionLoader : public CancelableRequestProvider {
  public:
-  ChromeOSVersionLoader();
+  VersionLoader();
 
   // Signature
   typedef Callback2<Handle, std::string>::Type GetVersionCallback;
@@ -36,9 +40,9 @@ class ChromeOSVersionLoader : public CancelableRequestProvider {
                     GetVersionCallback* callback);
 
  private:
-  FRIEND_TEST(ChromeOSVersionLoaderTest, ParseVersion);
+  FRIEND_TEST(VersionLoaderTest, ParseVersion);
 
-  // ChromeOSVersionLoader calls into the Backend on the file thread to load
+  // VersionLoader calls into the Backend on the file thread to load
   // and extract the version.
   class Backend : public base::RefCountedThreadSafe<Backend> {
    public:
@@ -57,7 +61,9 @@ class ChromeOSVersionLoader : public CancelableRequestProvider {
 
   scoped_refptr<Backend> backend_;
 
-  DISALLOW_COPY_AND_ASSIGN(ChromeOSVersionLoader);
+  DISALLOW_COPY_AND_ASSIGN(VersionLoader);
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_CHROMEOS_VERSION_LOADER_H_
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_VERSION_LOADER_H_
diff --git a/chrome/browser/chromeos/chromeos_version_loader_unittest.cc b/chrome/browser/chromeos/version_loader_unittest.cc
index 0e6b206..f23f4cd 100644
--- a/chrome/browser/chromeos/chromeos_version_loader_unittest.cc
+++ b/chrome/browser/chromeos/version_loader_unittest.cc
@@ -2,11 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/chromeos_version_loader.h"
+#include "chrome/browser/chromeos/version_loader.h"
+
+#include <string>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-typedef testing::Test ChromeOSVersionLoaderTest;
+namespace chromeos {
+
+typedef testing::Test VersionLoaderTest;
 
 static const char kTest1[] =
     "DIST_ID=1\nCHROMEOS_RELEASE_DESCRIPTION=0.2.3.3\nFOO=BAR";
@@ -15,11 +19,13 @@ static const char kTest3[] = "CHROMEOS_RELEASE_DESCRIPTION=\"0.2.3.3\"";
 static const char kTest4[] = "CHROMEOS_RELEASE_DESCRIPTION=\"\"\"";
 static const char kTest5[] = "CHROMEOS_RELEASE_DESCRIPTION=\"\"";
 
-TEST_F(ChromeOSVersionLoaderTest, ParseVersion) {
-  EXPECT_EQ("0.2.3.3", ChromeOSVersionLoader::ParseVersion(kTest1));
-  EXPECT_EQ("0.2.3.3", ChromeOSVersionLoader::ParseVersion(kTest2));
-  EXPECT_EQ("0.2.3.3", ChromeOSVersionLoader::ParseVersion(kTest3));
-  EXPECT_EQ("\"", ChromeOSVersionLoader::ParseVersion(kTest4));
-  EXPECT_EQ(std::string(), ChromeOSVersionLoader::ParseVersion(kTest5));
-  EXPECT_EQ(std::string(), ChromeOSVersionLoader::ParseVersion(std::string()));
+TEST_F(VersionLoaderTest, ParseVersion) {
+  EXPECT_EQ("0.2.3.3", VersionLoader::ParseVersion(kTest1));
+  EXPECT_EQ("0.2.3.3", VersionLoader::ParseVersion(kTest2));
+  EXPECT_EQ("0.2.3.3", VersionLoader::ParseVersion(kTest3));
+  EXPECT_EQ("\"", VersionLoader::ParseVersion(kTest4));
+  EXPECT_EQ(std::string(), VersionLoader::ParseVersion(kTest5));
+  EXPECT_EQ(std::string(), VersionLoader::ParseVersion(std::string()));
 }
+
+}  // namespace chromeos