Made sync code build and pass unit tests on OS X.

chrome/browser/sync/sync_setup_flow.cc

 // Copyright (c) 2009 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.
 
 #ifdef CHROME_PERSONALIZATION
 
-#include "chrome/browser/views/sync/sync_setup_flow.h"
+#include "chrome/browser/sync/sync_setup_flow.h"
 
 #include "app/gfx/font.h"
+#include "app/gfx/font_util.h"
 #include "base/histogram.h"
 #include "base/json_reader.h"
 #include "base/json_writer.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/sync/auth_error_state.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/pref_names.h"
 #include "grit/locale_settings.h"
-#include "views/window/window.h"
 
 // XPath expression for finding specific iframes.
 static const wchar_t* kLoginIFrameXPath = L"//iframe[@id='login']";
 static const wchar_t* kMergeIFrameXPath = L"//iframe[@id='merge']";
 static const wchar_t* kDoneIframeXPath = L"//iframe[@id='done']";
 
 // Helper function to read the JSON string from the Value parameter.
 static std::string GetJsonResponse(const Value* content) {
   if (!content || !content->IsType(Value::TYPE_LIST)) {
     NOTREACHED();
@@ skipping 115 matching lines @@
 SyncSetupFlow::~SyncSetupFlow() {
   flow_handler_->set_flow(NULL);
 }
 
 void SyncSetupFlow::GetDialogSize(gfx::Size* size) const {
   PrefService* prefs = service_->profile()->GetPrefs();
   gfx::Font approximate_web_font = gfx::Font::CreateFont(
       prefs->GetString(prefs::kWebKitSansSerifFontFamily),
       prefs->GetInteger(prefs::kWebKitDefaultFontSize));
 
-  gfx::Size s = views::Window::GetLocalizedContentsSizeForFont(
+  gfx::Size s = gfx::GetLocalizedContentsSizeForFont(
       IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS,
       IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES,
       approximate_web_font);
 
   size->set_width(s.width());
   size->set_height(s.height());
 }
 
 // A callback to notify the delegate that the dialog closed.
 void SyncSetupFlow::OnDialogClosed(const std::string& json_retval) {
@@ skipping 87 matching lines @@
         flow_handler_->ShowGaiaSuccessAndSettingUp();
       break;
     case SyncSetupWizard::MERGE_AND_SYNC:
       flow_handler_->ShowMergeAndSync();
       break;
     case SyncSetupWizard::FATAL_ERROR:
       if (current_state_ == SyncSetupWizard::MERGE_AND_SYNC)
         flow_handler_->ShowMergeAndSyncError();
       break;
     case SyncSetupWizard::DONE_FIRST_TIME:
-      flow_handler_->ShowFirstTimeDone(service_->GetAuthenticatedUsername());
+      flow_handler_->ShowFirstTimeDone(
+          UTF16ToWide(service_->GetAuthenticatedUsername()));
       break;
     case SyncSetupWizard::DONE:
-      flow_handler_->ShowSetupDone(service_->GetAuthenticatedUsername());
+      flow_handler_->ShowSetupDone(
+          UTF16ToWide(service_->GetAuthenticatedUsername()));
       break;
     default:
       NOTREACHED() << "Invalid advance state: " << advance_state;
   }
   current_state_ = advance_state;
 }
 
 // static
 SyncSetupFlow* SyncSetupFlow::Run(ProfileSyncService* service,
                                   SyncSetupFlowContainer* container,
@@ skipping 11 matching lines @@
 
   FlowHandler* handler = new FlowHandler();
   SyncSetupFlow* flow = new SyncSetupFlow(start, end, json_args,
       container, handler, service);
   handler->set_flow(flow);
   b->BrowserShowHtmlDialog(flow, NULL);
   return flow;
 }
 
 #endif  // CHROME_PERSONALIZATION