Revert accidental dartium code push

This reverts r264517 to r264538 from [email protected] BUG=none TEST=none NOTRY=true NOTREECHECKS=true [email protected] Review URL: https://codereview.chromium.org/239993009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264545 0039d316-1c4b-4281-b951-d872f2087c98
feiyue1206 · Apr 17, 2014 · 9a5bb05 · 9a5bb05
1 parent b8faca2
commit 9a5bb05
Show file tree

Hide file tree

Showing 38 changed files with 20 additions and 1,851 deletions.
diff --git a/OWNERS b/OWNERS
@@ -1,12 +1,5 @@
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
+[email protected]
+[email protected]
 per-file .gitignore=*
 per-file [email protected]
 per-file [email protected]

diff --git a/android_webview/common/aw_content_client.cc b/android_webview/common/aw_content_client.cc
@@ -27,7 +27,7 @@ namespace android_webview {
 
 std::string GetUserAgent() {
   // "Version/4.0" had been hardcoded in the legacy WebView.
-  std::string product = "Version/4.0 (Dart) " + GetProduct();
+  std::string product = "Version/4.0 " + GetProduct();
   if (CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kUseMobileUserAgent)) {
     product += " Mobile";

diff --git a/build/all.gyp b/build/all.gyp
@@ -242,18 +242,6 @@
         }],
       ],
     }, # target_name: All_syzygy
-    {
-      'target_name': 'dartium_builder',
-      'type': 'none',
-      'dependencies': [
-          '../dart/pkg/pkg.gyp:pkg_packages',
-          # '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
-          '../chrome/chrome.gyp:chrome',
-          '../chrome/chrome.gyp:chromedriver',
-          '../content/content_shell_and_tests.gyp:content_shell',
-          'blink_tests',
-      ],
-    },
     {
       # Note: Android uses android_builder_tests below.
       # TODO: Consider merging that with this target.

diff --git a/build/common.gypi b/build/common.gypi
@@ -420,7 +420,7 @@
       'enable_extensions%': 1,
 
       # Enable Google Now.
-      'enable_google_now%': 0,
+      'enable_google_now%': 1,
 
       # Enable printing support and UI. This variable is used to configure
       # which parts of printing will be built. 0 disables printing completely,
@@ -1148,7 +1148,7 @@
     # flag allows us to have warnings as errors in general to prevent
     # regressions in most modules, while working on the bits that are
     # remaining.
-    'win_third_party_warn_as_error%': 'false',
+    'win_third_party_warn_as_error%': 'true',
 
     # Clang stuff.
     'clang%': '<(clang)',
@@ -2727,7 +2727,6 @@
           }],
           [ 'OS=="mac" or OS=="ios"', {
             'xcode_settings': {
-              'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
               'WARNING_CFLAGS!': ['-Wall', '-Wextra'],
             },
             'conditions': [

diff --git a/chrome/browser/resources/about_version.html b/chrome/browser/resources/about_version.html
@@ -74,9 +74,6 @@
             <span i18n-content="js_version"></span>
           </td>
         </tr>
-        <tr><td class="label">Dart</td>
-          <td class="version" id="dart_version" i18n-content="dart_version"></td>
-        </tr>
 <if expr="not is_android">
         <tr><td class="label" i18n-content="flash_plugin"></td>
           <td class="version" id="flash_version" i18n-content="flash_version"></td>

diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc
@@ -95,12 +95,6 @@ std::string GetMimeTypeForPath(const std::string& path) {
     return "image/png";
   } else if (EndsWith(filename, ".gif", false)) {
     return "image/gif";
-  } else if (EndsWith(filename, ".svg", false)) {
-    return "image/svg+xml";
-  } else if (EndsWith(filename, ".ttf", false)) {
-    return "application/octet-stream";
-  } else if (EndsWith(filename, ".woff", false)) {
-    return "application/font-woff";
   } else if (EndsWith(filename, ".manifest", false)) {
     return "text/cache-manifest";
   }
@@ -186,26 +180,13 @@ class DevToolsDataSource : public content::URLDataSource {
   }
 
   virtual bool ShouldAddContentSecurityPolicy() const OVERRIDE {
-    // Required as the Dart Observatory is bundled as its own iframe hosted on
-    // chrome-devtools.
-    return true;
-  }
-
-  virtual bool ShouldDenyXFrameOptions() const OVERRIDE {
-    // Required as the Dart Observatory is bundled as its own iframe hosted on
-    // chrome-devtools.
     return false;
   }
 
   virtual bool ShouldServeMimeTypeAsContentTypeHeader() const OVERRIDE {
     return true;
   }
 
-  virtual std::string GetContentSecurityPolicyFrameSrc() const OVERRIDE {
-    // The Dart Observatory is bundled as its own iframe.
-    return "frame-src chrome-devtools://devtools/bundled/Observatory/index_devtools.html;";
-  }
-
  private:
   virtual ~DevToolsDataSource() {}
   scoped_refptr<net::URLRequestContextGetter> request_context_;

diff --git a/chrome/browser/ui/webui/version_ui.cc b/chrome/browser/ui/webui/version_ui.cc
@@ -36,8 +36,6 @@
 #include "chrome/browser/ui/webui/version_handler_chromeos.h"
 #endif
 
-#include "dartvm_revision.h"  // NOLINT
-
 namespace {
 
 content::WebUIDataSource* CreateVersionUIDataSource(Profile* profile) {
@@ -56,7 +54,6 @@ content::WebUIDataSource* CreateVersionUIDataSource(Profile* profile) {
   html_source->AddString("blink_version", content::GetWebKitVersion());
   html_source->AddString("js_engine", "V8");
   html_source->AddString("js_version", v8::V8::GetVersion());
-  html_source->AddString("dart_version", DART_VM_REVISION);
 
 #if defined(OS_ANDROID)
   html_source->AddLocalizedString("application_label",

diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
@@ -504,14 +504,7 @@ std::string ChromeContentClient::GetProduct() const {
 }
 
 std::string ChromeContentClient::GetUserAgent() const {
-  std::string product = GetProduct();
-  product += " (Dart)";
-#if defined(OS_ANDROID)
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kUseMobileUserAgent))
-    product += " Mobile";
-#endif
-  return webkit_glue::BuildUserAgentFromProduct(product);
+  return ::GetUserAgent();
 }
 
 base::string16 ChromeContentClient::GetLocalizedString(int message_id) const {

diff --git a/chrome/tools/build/mac/verify_order b/chrome/tools/build/mac/verify_order
@@ -13,8 +13,6 @@
 # This script can be used to verify that all of the global text symbols in
 # a Mach-O file are accounted for in an order file.
 
-exit 0
-
 if [ ${#} -ne 2 ] ; then
   echo "usage: ${0} LAST_SYMBOL MACH_O_FILE" >& 2
   exit 1

diff --git a/codereview.settings b/codereview.settings
@@ -1,4 +1,10 @@
 # This file is used by gcl to get repository specific information.
-CODE_REVIEW_SERVER: http://codereview.chromium.org
-CC_LIST: [email protected]
-VIEW_VC: http://src.chromium.org/viewvc/multivm/branches/1650/chrome?view=rev&revision=
+CODE_REVIEW_SERVER: codereview.chromium.org
+CC_LIST: [email protected]
+VIEW_VC: https://src.chromium.org/viewvc/chrome?view=rev&revision=
+STATUS: http://chromium-status.appspot.com/status
+TRY_ON_UPLOAD: True
+TRYSERVER_SVN_URL: svn://svn.chromium.org/chrome-try/try
+GITCL_PREUPLOAD: http://src.chromium.org/viewvc/trunk/tools/depot_tools/git-cl-upload-hook?revision=HEAD&root=chrome
+GITCL_PREDCOMMIT: http://src.chromium.org/viewvc/trunk/tools/depot_tools/git-cl-upload-hook?revision=HEAD&root=chrome
+LINT_IGNORE_REGEX: webkit/api/.*
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
@@ -133,7 +133,7 @@ void SetupSandbox(const CommandLine& parsed_command_line) {
   scoped_ptr<sandbox::SetuidSandboxClient> setuid_sandbox_client(
       sandbox::SetuidSandboxClient::Create());
 
-  const bool want_setuid_sandbox = false &&
+  const bool want_setuid_sandbox =
       !parsed_command_line.HasSwitch(switches::kNoSandbox) &&
       !parsed_command_line.HasSwitch(switches::kDisableSetuidSandbox) &&
       !setuid_sandbox_client->IsDisabledViaEnvironment();

diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc
@@ -49,12 +49,10 @@ namespace content {
 
 namespace {
 
-// TODO(jacobr) remove https://www.google.com when the dependency on the
-// Google Charts API is removed from the Dart Observatory.
 // TODO(tsepez) remove unsafe-eval when bidichecker_packaged.js fixed.
 const char kChromeURLContentSecurityPolicyHeaderBase[] =
     "Content-Security-Policy: script-src chrome://resources "
-    "'self' https://www.google.com 'unsafe-eval'; ";
+    "'self' 'unsafe-eval'; ";
 
 const char kChromeURLXFrameOptionsHeader[] = "X-Frame-Options: DENY";
 

diff --git a/content/child/simple_webmimeregistry_impl.cc b/content/child/simple_webmimeregistry_impl.cc
@@ -40,13 +40,6 @@ WebMimeRegistry::SupportsType
       WebMimeRegistry::IsSupported : WebMimeRegistry::IsNotSupported;
 }
 
-WebMimeRegistry::SupportsType
-    SimpleWebMimeRegistryImpl::supportsDartMIMEType(
-    const WebString& mime_type) {
-  return net::IsSupportedDartMimeType(ToASCIIOrEmpty(mime_type)) ?
-      WebMimeRegistry::IsSupported : WebMimeRegistry::IsNotSupported;
-}
-
 // When debugging layout tests failures in the test shell,
 // see TestShellWebMimeRegistryImpl.
 WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsMediaMIMEType(

diff --git a/content/child/simple_webmimeregistry_impl.h b/content/child/simple_webmimeregistry_impl.h
@@ -30,8 +30,6 @@ class CONTENT_EXPORT SimpleWebMimeRegistryImpl :
       const blink::WebString&);
   virtual blink::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType(
       const blink::WebString&);
-  virtual blink::WebMimeRegistry::SupportsType supportsDartMIMEType(
-      const blink::WebString&);
   virtual blink::WebMimeRegistry::SupportsType supportsMediaMIMEType(
       const blink::WebString&,
       const blink::WebString&,

diff --git a/content/shell/common/shell_content_client.cc b/content/shell/common/shell_content_client.cc
@@ -23,7 +23,6 @@ ShellContentClient::~ShellContentClient() {
 
 std::string ShellContentClient::GetUserAgent() const {
   std::string product = "Chrome/" CONTENT_SHELL_VERSION;
-  product += " (Dart)";
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kUseMobileUserAgent))
     product += " Mobile";

diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc
@@ -241,12 +241,6 @@ WorkerWebKitPlatformSupportImpl::supportsJavaScriptMIMEType(const WebString&) {
   return WebMimeRegistry::IsSupported;
 }
 
-WebMimeRegistry::SupportsType
-WorkerWebKitPlatformSupportImpl::supportsDartMIMEType(const WebString&) {
-  NOTREACHED();
-  return WebMimeRegistry::IsSupported;
-}
-
 WebMimeRegistry::SupportsType
 WorkerWebKitPlatformSupportImpl::supportsMediaMIMEType(
     const WebString&, const WebString&, const WebString&) {

diff --git a/content/worker/worker_webkitplatformsupport_impl.h b/content/worker/worker_webkitplatformsupport_impl.h
@@ -83,8 +83,6 @@ class WorkerWebKitPlatformSupportImpl : public BlinkPlatformImpl,
       const blink::WebString&);
   virtual blink::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType(
       const blink::WebString&);
-  virtual blink::WebMimeRegistry::SupportsType supportsDartMIMEType(
-      const blink::WebString&);
   virtual blink::WebMimeRegistry::SupportsType supportsMediaMIMEType(
       const blink::WebString&,
       const blink::WebString&,