Add a command line parameter to disable online EULA.

chrome/browser/ui/webui/about_ui.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/about_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 36 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/process_type.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/escape.h"
+#include "net/base/load_flags.h"
 #include "net/base/net_util.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
 #include "ui/webui/web_ui_util.h"
 
 #if defined(ENABLE_THEMES)
 #include "chrome/browser/ui/webui/theme_source.h"
 #endif
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
 #include "content/public/browser/zygote_host_linux.h"
 #include "content/public/common/sandbox_linux.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/enumerate_modules_model_win.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
 #include "chrome/browser/ui/webui/chromeos/about_network.h"
+#include "chromeos/chromeos_switches.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/wm/frame_painter.h"
 #include "base/strings/string_split.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
 using content::BrowserThread;
@@ skipping 57 matching lines @@
 
   explicit ChromeOSOnlineTermsHandler(const FetchCallback& callback)
       : fetch_callback_(callback) {
     eula_fetcher_.reset(net::URLFetcher::Create(
         GURL(l10n_util::GetStringUTF16(IDS_EULA_POLICY_URL)),
         net::URLFetcher::GET,
         this));
     eula_fetcher_->SetRequestContext(
         g_browser_process->system_request_context());
     eula_fetcher_->AddExtraRequestHeader("Accept: text/html");
+    eula_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
+                                net::LOAD_DO_NOT_SAVE_COOKIES |
+                                net::LOAD_DISABLE_CACHE);
     eula_fetcher_->Start();
     // Abort the download attempt if it takes longer than one minute.
     download_timer_.Start(FROM_HERE,
                           base::TimeDelta::FromSeconds(kOnlineTermsTimeoutSec),
                           this,
                           &ChromeOSOnlineTermsHandler::OnDownloadTimeout);
   }
 
   void GetResponseResult(std::string* response_string) {
     std::string mime_type;
@@ skipping 64 matching lines @@
 
   virtual ~ChromeOSTermsHandler() {}
 
   void StartOnUIThread() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     if (path_ == chrome::kOemEulaURLPath) {
       // Load local OEM EULA from the disk.
       BrowserThread::PostTask(
           BrowserThread::FILE, FROM_HERE,
           base::Bind(&ChromeOSTermsHandler::LoadOemEulaFileOnFileThread, this));
     } else {

[Evan Stade, 2013/04/23 18:50:05]

this looks equivalent to

if {} else if {} else {}

-      // Try to load online version of ChromeOS terms first.
-      // ChromeOSOnlineTermsHandler object destroys itself.
-      new ChromeOSOnlineTermsHandler(
-          base::Bind(&ChromeOSTermsHandler::OnOnlineEULAFetched, this));
+      if (CommandLine::ForCurrentProcess()->HasSwitch(
+              chromeos::switches::kDisableOnlineEULA)) {
+        // Fallback to the local file.
+        BrowserThread::PostTask(
+            BrowserThread::FILE, FROM_HERE,
+            base::Bind(&ChromeOSTermsHandler::LoadEulaFileOnFileThread, this));
+      } else {
+        // Try to load online version of ChromeOS terms first.
+        // ChromeOSOnlineTermsHandler object destroys itself.
+        new ChromeOSOnlineTermsHandler(
+            base::Bind(&ChromeOSTermsHandler::OnOnlineEULAFetched, this));
+      }
     }
   }
 
   void OnOnlineEULAFetched(ChromeOSOnlineTermsHandler* loader) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     loader->GetResponseResult(&contents_);
     if (contents_.empty()) {
       // Load local ChromeOS terms from the file.
       BrowserThread::PostTask(
           BrowserThread::FILE, FROM_HERE,
@@ skipping 906 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui);
 
 #if defined(ENABLE_THEMES)
   // Set up the chrome://theme/ source.
   ThemeSource* theme = new ThemeSource(profile);
   content::URLDataSource::Add(profile, theme);
 #endif
 
   content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile));
 }