Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / options / advanced_options_utils_linux.cc

diff --git a/src/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc b/src/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc
index f1c3790..0f7c4b7 100644 (file)
--- a/src/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc
+++ b/src/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc
@@ -8,8 +8,8 @@
 
 #include "base/bind.h"
 #include "base/environment.h"
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/nix/xdg_util.h"
 #include "base/process/launch.h"
 #include "base/strings/string_util.h"
@@ -45,14 +45,14 @@ namespace {
 
 // Show the proxy config URL in the given tab.
 void ShowLinuxProxyConfigUrl(int render_process_id, int render_view_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   scoped_ptr<base::Environment> env(base::Environment::Create());
   const char* name = base::nix::GetDesktopEnvironmentName(env.get());
   if (name)
     LOG(ERROR) << "Could not find " << name << " network settings in $PATH";
   OpenURLParams params(
       GURL(kLinuxProxyConfigUrl), Referrer(), NEW_FOREGROUND_TAB,
-      content::PAGE_TRANSITION_LINK, false);
+      ui::PAGE_TRANSITION_LINK, false);
 
   WebContents* web_contents =
       tab_util::GetWebContentsByID(render_process_id, render_view_id);
@@ -62,7 +62,7 @@ void ShowLinuxProxyConfigUrl(int render_process_id, int render_view_id) {
 
 // Start the given proxy configuration utility.
 bool StartProxyConfigUtil(const char* command[]) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   // base::LaunchProcess() returns true ("success") if the fork()
   // succeeds, but not necessarily the exec(). We'd like to be able to
   // use StartProxyConfigUtil() to search possible options and stop on
@@ -105,7 +105,7 @@ bool StartProxyConfigUtil(const char* command[]) {
 // failure to do so, show the Linux proxy config URL in a new tab instead.
 void DetectAndStartProxyConfigUtil(int render_process_id,
                                    int render_view_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   scoped_ptr<base::Environment> env(base::Environment::Create());
 
   bool launched = false;