Revert of Linux: Sync GetDesktopName in gtk2_util.cc

Revert of Linux: Sync GetDesktopName in gtk2_util.cc (patchset #2 id:20001 of https://codereview.chromium.org/2195063003/ )

Reason for revert:
Broke Linux GN build on my desktop (linker error):

obj/chrome/browser/ui/libgtk2ui/libgtk2ui/gtk2_util.o:../../chrome/browser/ui/libgtk2ui/gtk2_util.cc:function libgtk2ui::GetDesktopName(base::Environment*): error: undefined reference to 'chrome::GetChannel()'
clang: error: linker command failed with exit code 1 (use -v to see invocation)

Contents of my out/Release/args.gn:

  is_component_build = true
  is_debug = false
  is_chrome_branded = true
  dcheck_always_on = true
  use_goma = true

Original issue's description:
> Linux: Sync GetDesktopName in gtk2_util.cc
>
> BUG=632841
>
> Committed: https://crrev.com/12d7c7f1f6a38f067803c676e5cac9cccc11dab2
> Cr-Commit-Position: refs/heads/master@{#408846}

TBR=thestig@chromium.org,thomasanderson@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=632841
Committed: https://crrev.com/c0ca73870067f6f2c435e45eecb1b8a97cd48a78
Cr-Commit-Position: refs/heads/master@{#408880}

[miu, 2016-07-30 23:26:41]

The CQ bit was checked by miu@chromium.org

[miu, 2016-07-30 23:26:41]

Created Revert of Linux: Sync GetDesktopName in gtk2_util.cc

[commit-bot: I haz the power, 2016-07-30 23:26:46]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-30 23:27:20]

Description was changed from

==========
Revert of Linux: Sync GetDesktopName in gtk2_util.cc (patchset #2 id:20001 of
https://codereview.chromium.org/2195063003/ )

Reason for revert:
Broke Linux GN build on my desktop (linker error):

obj/chrome/browser/ui/libgtk2ui/libgtk2ui/gtk2_util.o:../../chrome/browser/ui/libgtk2ui/gtk2_util.cc:function
libgtk2ui::GetDesktopName(base::Environment*): error: undefined reference to
'chrome::GetChannel()'
clang: error: linker command failed with exit code 1 (use -v to see invocation)

Contents of my out/Release/args.gn:

  is_component_build = true
  is_debug = false
  is_chrome_branded = true
  dcheck_always_on = true
  use_goma = true


Original issue's description:
> Linux: Sync GetDesktopName in gtk2_util.cc
> 
> BUG=632841
> 
> Committed: https://crrev.com/12d7c7f1f6a38f067803c676e5cac9cccc11dab2
> Cr-Commit-Position: refs/heads/master@{#408846}

TBR=thestig@chromium.org,thomasanderson@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=632841
==========

to

==========
Revert of Linux: Sync GetDesktopName in gtk2_util.cc (patchset #2 id:20001 of
https://codereview.chromium.org/2195063003/ )

Reason for revert:
Broke Linux GN build on my desktop (linker error):

obj/chrome/browser/ui/libgtk2ui/libgtk2ui/gtk2_util.o:../../chrome/browser/ui/libgtk2ui/gtk2_util.cc:function
libgtk2ui::GetDesktopName(base::Environment*): error: undefined reference to
'chrome::GetChannel()'
clang: error: linker command failed with exit code 1 (use -v to see invocation)

Contents of my out/Release/args.gn:

  is_component_build = true
  is_debug = false
  is_chrome_branded = true
  dcheck_always_on = true
  use_goma = true


Original issue's description:
> Linux: Sync GetDesktopName in gtk2_util.cc
> 
> BUG=632841
> 
> Committed: https://crrev.com/12d7c7f1f6a38f067803c676e5cac9cccc11dab2
> Cr-Commit-Position: refs/heads/master@{#408846}

TBR=thestig@chromium.org,thomasanderson@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=632841
==========

[commit-bot: I haz the power, 2016-07-30 23:27:21]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-07-30 23:29:23]

Description was changed from

==========
Revert of Linux: Sync GetDesktopName in gtk2_util.cc (patchset #2 id:20001 of
https://codereview.chromium.org/2195063003/ )

Reason for revert:
Broke Linux GN build on my desktop (linker error):

obj/chrome/browser/ui/libgtk2ui/libgtk2ui/gtk2_util.o:../../chrome/browser/ui/libgtk2ui/gtk2_util.cc:function
libgtk2ui::GetDesktopName(base::Environment*): error: undefined reference to
'chrome::GetChannel()'
clang: error: linker command failed with exit code 1 (use -v to see invocation)

Contents of my out/Release/args.gn:

  is_component_build = true
  is_debug = false
  is_chrome_branded = true
  dcheck_always_on = true
  use_goma = true


Original issue's description:
> Linux: Sync GetDesktopName in gtk2_util.cc
> 
> BUG=632841
> 
> Committed: https://crrev.com/12d7c7f1f6a38f067803c676e5cac9cccc11dab2
> Cr-Commit-Position: refs/heads/master@{#408846}

TBR=thestig@chromium.org,thomasanderson@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=632841
==========

to

==========
Revert of Linux: Sync GetDesktopName in gtk2_util.cc (patchset #2 id:20001 of
https://codereview.chromium.org/2195063003/ )

Reason for revert:
Broke Linux GN build on my desktop (linker error):

obj/chrome/browser/ui/libgtk2ui/libgtk2ui/gtk2_util.o:../../chrome/browser/ui/libgtk2ui/gtk2_util.cc:function
libgtk2ui::GetDesktopName(base::Environment*): error: undefined reference to
'chrome::GetChannel()'
clang: error: linker command failed with exit code 1 (use -v to see invocation)

Contents of my out/Release/args.gn:

  is_component_build = true
  is_debug = false
  is_chrome_branded = true
  dcheck_always_on = true
  use_goma = true

Original issue's description:
> Linux: Sync GetDesktopName in gtk2_util.cc
>
> BUG=632841
>
> Committed: https://crrev.com/12d7c7f1f6a38f067803c676e5cac9cccc11dab2
> Cr-Commit-Position: refs/heads/master@{#408846}

TBR=thestig@chromium.org,thomasanderson@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=632841

Committed: https://crrev.com/c0ca73870067f6f2c435e45eecb1b8a97cd48a78
Cr-Commit-Position: refs/heads/master@{#408880}
==========

[commit-bot: I haz the power, 2016-07-30 23:29:24]

Patchset 1 (id:??) landed as
https://crrev.com/c0ca73870067f6f2c435e45eecb1b8a97cd48a78
Cr-Commit-Position: refs/heads/master@{#408880}

[Lei Zhang, 2016-08-01 16:52:01]

Are you doing a Chrome branded + shared_library build locally?

[miu, 2016-08-01 18:21:11]

On 2016/08/01 16:52:01, Lei Zhang wrote:
> Are you doing a Chrome branded + shared_library build locally?

Yes. I work on a number of browser features that require a Chrome-branded build.

[Lei Zhang, 2016-08-01 19:12:03]

On 2016/08/01 18:21:11, miu wrote:
> On 2016/08/01 16:52:01, Lei Zhang wrote:
> > Are you doing a Chrome branded + shared_library build locally?
> 
> Yes. I work on a number of browser features that require a Chrome-branded
build.

Well, Tom and I were previously discussing how no bots build this configuration,
so we thought it was ok. I guess we'll have to find some other way to fix our
bug.

[miu, 2016-08-01 21:01:01]

On 2016/08/01 19:12:03, Lei Zhang wrote:
> On 2016/08/01 18:21:11, miu wrote:
> > On 2016/08/01 16:52:01, Lei Zhang wrote:
> > > Are you doing a Chrome branded + shared_library build locally?
> > 
> > Yes. I work on a number of browser features that require a Chrome-branded
> build.
> 
> Well, Tom and I were previously discussing how no bots build this
configuration,
> so we thought it was ok. I guess we'll have to find some other way to fix our
> bug.

FWIW, I do sympathize with the problem here: That you really don't want to have
to maintain 2 copies of chrome::GetChannel(). I'm wondering if there's a case
for moving chrome::GetChannel() up the dependency chain (even to src/base?!?) to
resolve the linking issues.