Unfork various Sync settings UI classes

chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler2.cc

 // Copyright (c) 2011 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/change_picture_options_handler2.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
@@ skipping 312 matching lines @@
 
 void ChangePictureOptionsHandler::OnCameraPresenceCheckDone() {
   SetCameraPresent(CameraDetector::camera_presence() ==
                    CameraDetector::kCameraPresent);
 }
 
 void ChangePictureOptionsHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  ::options2::OptionsPageUIHandler::Observe(type, source, details);
+  OptionsPageUIHandler::Observe(type, source, details);
   if (type == chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED) {
     // User profile image has been updated.
     SendProfileImage(*content::Details<const SkBitmap>(details).ptr(), false);
   }
 }
 
 gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const {
   Browser* browser =
       BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui()));
   if (!browser)
     return NULL;
   return browser->window()->GetNativeHandle();
 }
 
 }  // namespace options2
 }  // namespace chromeos