Merge 82987, 83304 - make sure that OEM tab is shown even if first login is Guest

chrome/browser/chromeos/login/apply_services_customization.cc

Index: chrome/browser/chromeos/login/apply_services_customization.cc
===================================================================
--- chrome/browser/chromeos/login/apply_services_customization.cc	(revision 83304)
+++ chrome/browser/chromeos/login/apply_services_customization.cc	(working copy)
@@ -1,174 +0,0 @@
-// 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/chromeos/login/apply_services_customization.h"
-
-#include "base/command_line.h"
-#include "base/file_path.h"
-#include "base/file_util.h"
-#include "base/logging.h"
-#include "base/utf_string_conversions.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/customization_document.h"
-#include "chrome/browser/chromeos/login/existing_user_controller.h"
-#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/profiles/profile_manager.h"
-#include "content/browser/browser_thread.h"
-#include "googleurl/src/gurl.h"
-
-namespace {
-
-// URL where to fetch OEM services customization manifest from.
-const char kServicesCustomizationManifestUrl[] =
-    "file:///opt/oem/etc/services_manifest.json";
-
-// Name of local state option that tracks if services customization has been
-// applied.
-const char kServicesCustomizationAppliedPref[] = "ServicesCustomizationApplied";
-
-// Maximum number of retries to fetch file if network is not available.
-const int kMaxFetchRetries = 3;
-
-// Delay between file fetch retries if network is not available.
-const int kRetriesDelayInSec = 2;
-
-}  // namespace
-
-DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::ApplyServicesCustomization);
-
-namespace chromeos {
-
-// static
-void ApplyServicesCustomization::StartIfNeeded() {
-  if (!IsApplied()) {
-    ApplyServicesCustomization* object =
-        new ApplyServicesCustomization(kServicesCustomizationManifestUrl);
-    if (!object->Init()) {
-      delete object;
-    }
-    // |object| will be deleted on download complete.
-  }
-}
-
-// static
-void ApplyServicesCustomization::RegisterPrefs(PrefService* local_state) {
-  local_state->RegisterBooleanPref(kServicesCustomizationAppliedPref, false);
-}
-
-// static
-bool ApplyServicesCustomization::IsApplied() {
-  PrefService* prefs = g_browser_process->local_state();
-  return prefs->GetBoolean(kServicesCustomizationAppliedPref);
-}
-
-// static
-void ApplyServicesCustomization::SetApplied(bool val) {
-  PrefService* prefs = g_browser_process->local_state();
-  prefs->SetBoolean(kServicesCustomizationAppliedPref, val);
-}
-
-ApplyServicesCustomization::ApplyServicesCustomization(
-    const std::string& url_str) : url_(url_str), num_retries_(0) {
-}
-
-bool ApplyServicesCustomization::Init() {
-  DCHECK(url_.is_valid());
-  if (!url_.is_valid()) {
-    return false;
-  }
-
-  if (url_.SchemeIsFile()) {
-    BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
-        NewRunnableMethod(this,
-            &ApplyServicesCustomization::ReadFileInBackground,
-            FilePath(url_.path())));
-  } else {
-    StartFileFetch();
-  }
-
-  return true;
-}
-
-void ApplyServicesCustomization::StartFileFetch() {
-  url_fetcher_.reset(new URLFetcher(url_, URLFetcher::GET, this));
-  url_fetcher_->set_request_context(
-      ProfileManager::GetDefaultProfile()->GetRequestContext());
-  url_fetcher_->Start();
-}
-
-void ApplyServicesCustomization::OnURLFetchComplete(
-    const URLFetcher* source,
-    const GURL& url,
-    const net::URLRequestStatus& status,
-    int response_code,
-    const ResponseCookies& cookies,
-    const std::string& data) {
-  if (response_code == 200) {
-    Apply(data);
-  } else {
-    NetworkLibrary* network = CrosLibrary::Get()->GetNetworkLibrary();
-    if (!network->Connected() && num_retries_ < kMaxFetchRetries) {
-      num_retries_++;
-      retry_timer_.Start(base::TimeDelta::FromSeconds(kRetriesDelayInSec),
-                         this, &ApplyServicesCustomization::StartFileFetch);
-      return;
-    }
-    LOG(ERROR) << "URL fetch for services customization failed:"
-               << " response code = " << response_code
-               << " URL = " << url.spec();
-  }
-  MessageLoop::current()->DeleteSoon(FROM_HERE, this);
-}
-
-void ApplyServicesCustomization::ReadFileInBackground(const FilePath& file) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-
-  std::string manifest;
-  if (file_util::ReadFileToString(file, &manifest)) {
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        NewRunnableMethod(
-            this, &ApplyServicesCustomization::ApplyAndDelete, manifest));
-  } else {
-    VLOG(1) << "Failed to load services customization manifest from: "
-            << file.value();
-    BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, this);
-  }
-}
-
-void ApplyServicesCustomization::ApplyAndDelete(const std::string& manifest) {
-  Apply(manifest);
-  MessageLoop::current()->DeleteSoon(FROM_HERE, this);
-}
-
-void ApplyServicesCustomization::Apply(const std::string& manifest) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  chromeos::ServicesCustomizationDocument customization;
-  if (!customization.LoadManifestFromString(manifest)) {
-    LOG(ERROR) << "Failed to partner parse services customizations manifest";
-    return;
-  }
-
-  VLOG(1) << "Partner services customizations manifest loaded successfully";
-  std::string locale = g_browser_process->GetApplicationLocale();
-  std::string initial_start_page = customization.GetInitialStartPage(locale);
-  if (!initial_start_page.empty()) {
-    VLOG(1) << "initial_start_page_url: " << initial_start_page;
-    ExistingUserController* current_controller =
-        ExistingUserController::current_controller();
-    if (current_controller) {
-      current_controller->set_initial_start_page(initial_start_page);
-    } else {
-      // Exit here to don't safe that manifest was applied.
-      return;
-    }
-  }
-  // TODO(dpolukhin): apply customized apps, exts and support page.
-
-  SetApplied(true);
-}
-
-}  // namespace chromeos